diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-01 18:10:45 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-01 18:10:45 -0500 |
| commit | e0a5c57848f7690a247bb8af4fa412844b0b00bb (patch) | |
| tree | 3cf1fd6858cab9c030e5cd0d98d04fc0b7bd41b3 /drivers/net/e1000/e1000.h | |
| parent | fe05f54181db868c5720cc4dc0741227b9ba5a60 (diff) | |
| parent | b5b9d6647c1cd5eee90b58941c55f874c2a7e707 (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/e1000/e1000.h')
| -rw-r--r-- | drivers/net/e1000/e1000.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h index 27c77306193b..99baf0e099fc 100644 --- a/drivers/net/e1000/e1000.h +++ b/drivers/net/e1000/e1000.h | |||
| @@ -225,9 +225,6 @@ struct e1000_rx_ring { | |||
| 225 | struct e1000_ps_page *ps_page; | 225 | struct e1000_ps_page *ps_page; |
| 226 | struct e1000_ps_page_dma *ps_page_dma; | 226 | struct e1000_ps_page_dma *ps_page_dma; |
| 227 | 227 | ||
| 228 | struct sk_buff *rx_skb_top; | ||
| 229 | struct sk_buff *rx_skb_prev; | ||
| 230 | |||
| 231 | /* cpu for rx queue */ | 228 | /* cpu for rx queue */ |
| 232 | int cpu; | 229 | int cpu; |
| 233 | 230 | ||