diff options
author | Paul Mackerras <paulus@samba.org> | 2007-11-02 14:03:14 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-11-02 14:03:14 +1100 |
commit | 97a4649d6ffce4a5d7f5ce018d87a6cefcb4ad03 (patch) | |
tree | 8f7f591754baa934a842357e75e773a525bfb147 /drivers/net/e1000e/e1000.h | |
parent | [POWERPC] powerpc: Fix demotion of segments to 4K pages (diff) | |
parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
download | linux-dev-97a4649d6ffce4a5d7f5ce018d87a6cefcb4ad03.tar.xz linux-dev-97a4649d6ffce4a5d7f5ce018d87a6cefcb4ad03.zip |
Merge branch 'linux-2.6' into merge
Diffstat (limited to 'drivers/net/e1000e/e1000.h')
-rw-r--r-- | drivers/net/e1000e/e1000.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h index d2499bb07c13..473f78de4be0 100644 --- a/drivers/net/e1000e/e1000.h +++ b/drivers/net/e1000e/e1000.h @@ -122,7 +122,8 @@ struct e1000_buffer { u16 next_to_watch; }; /* RX */ - struct page *page; + /* arrays of page information for packet split */ + struct e1000_ps_page *ps_pages; }; }; @@ -142,8 +143,6 @@ struct e1000_ring { /* array of buffer information structs */ struct e1000_buffer *buffer_info; - /* arrays of page information for packet split */ - struct e1000_ps_page *ps_pages; struct sk_buff *rx_skb_top; struct e1000_queue_stats stats; |