diff options
| author | Auke Kok <auke-jan.h.kok@intel.com> | 2007-10-25 13:57:44 -0700 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-29 05:47:08 -0400 |
| commit | 47f44e40a3c12f8604aba9288d7a7f991cbf17ba (patch) | |
| tree | 0531dd3d7501a519946046d2cf18d596bcb4d903 /drivers/net/e1000e/e1000.h | |
| parent | e38c2c651a038b78fd01cf2e3f3a65cacf0e41cc (diff) | |
| download | op-kernel-dev-47f44e40a3c12f8604aba9288d7a7f991cbf17ba.zip op-kernel-dev-47f44e40a3c12f8604aba9288d7a7f991cbf17ba.tar.gz | |
e1000e: Fix jumbo frame receive code.
Fix allocation and freeing of jumbo frames where several bugs
were recently introduced by cleanups after we forked this code
from e1000. This moves ps_pages to buffer_info where it really
belongs and makes it a dynamically allocated array. The penalty
is not that high since it's allocated outside of the buffer_info
struct anyway.
Without this patch all jumbo frames are completely broken and the
driver panics.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/e1000e/e1000.h')
| -rw-r--r-- | drivers/net/e1000e/e1000.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h index d2499bb..811eada 100644 --- a/drivers/net/e1000e/e1000.h +++ b/drivers/net/e1000e/e1000.h @@ -123,6 +123,8 @@ struct e1000_buffer { }; /* RX */ struct page *page; + /* arrays of page information for packet split */ + struct e1000_ps_page *ps_pages; }; }; @@ -142,8 +144,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; |
