diff options
| author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2006-10-24 23:46:06 +0200 |
|---|---|---|
| committer | Auke Kok <juke-jan.h.kok@intel.com> | 2006-10-24 23:46:06 +0200 |
| commit | d2a1e2131aee7b3feb815636dc7917a96e49fd8e (patch) | |
| tree | 08d034a19882924c620282f21e1adcd111225f6c /drivers | |
| parent | e1000: FIX: Don't limit descriptor size to 4kb for PCI-E adapters (diff) | |
| download | linux-d2a1e2131aee7b3feb815636dc7917a96e49fd8e.tar.xz linux-d2a1e2131aee7b3feb815636dc7917a96e49fd8e.zip | |
e1000: FIX: move length adjustment due to crc stripping disabled.
Move the length (rx_bytes counter) adjustment of 4 bytes down to after the
TBI_ACCEPT workaround.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index e75909ee6d85..66ed920df406 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -3786,9 +3786,6 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter, length = le16_to_cpu(rx_desc->length); - /* adjust length to remove Ethernet CRC */ - length -= 4; - if (unlikely(!(status & E1000_RXD_STAT_EOP))) { /* All receives must fit into a single buffer */ E1000_DBG("%s: Receive packet consumed multiple" @@ -3816,6 +3813,10 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter, } } + /* adjust length to remove Ethernet CRC, this must be + * done after the TBI_ACCEPT workaround above */ + length -= 4; + /* code added for copybreak, this should improve * performance for small packets with large amounts * of reassembly being done in the stack */ |