diff options
author | Ingo Molnar | 2011-10-04 11:08:16 +0200 |
---|---|---|
committer | Ingo Molnar | 2011-10-04 11:09:08 +0200 |
commit | 22f92bacbeea24b20e447444c28e7cad9f1ac3f8 (patch) | |
tree | 5c3f2346804a186aa2d954f078fd2f4d44bcc26e /drivers/net/greth.h | |
parent | sched, tracing: Show PREEMPT_ACTIVE state in trace_sched_switch (diff) | |
parent | Merge branch 'hwmon-for-linus' of git://github.com/groeck/linux (diff) | |
download | kernel-qcow2-linux-22f92bacbeea24b20e447444c28e7cad9f1ac3f8.tar.gz kernel-qcow2-linux-22f92bacbeea24b20e447444c28e7cad9f1ac3f8.tar.xz kernel-qcow2-linux-22f92bacbeea24b20e447444c28e7cad9f1ac3f8.zip |
Merge branch 'linus' into sched/core
Merge reason: pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/greth.h')
-rw-r--r-- | drivers/net/greth.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/greth.h b/drivers/net/greth.h index 9a0040dee4da..232a622a85b7 100644 --- a/drivers/net/greth.h +++ b/drivers/net/greth.h @@ -103,6 +103,7 @@ struct greth_private { unsigned char *tx_bufs[GRETH_TXBD_NUM]; unsigned char *rx_bufs[GRETH_RXBD_NUM]; + u16 tx_bufs_length[GRETH_TXBD_NUM]; u16 tx_next; u16 tx_last; |