aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Brandeburg <jesse.brandeburg@intel.com>2006-10-24 17:46:06 -0400
committerAuke Kok <juke-jan.h.kok@intel.com>2006-10-24 17:46:06 -0400
commitd2a1e2131aee7b3feb815636dc7917a96e49fd8e (patch)
tree08d034a19882924c620282f21e1adcd111225f6c
parent032fe6e9e253ebb37a0df0893844674dea9210fd (diff)
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>
-rw-r--r--drivers/net/e1000/e1000_main.c7
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,
3786 3786
3787 length = le16_to_cpu(rx_desc->length); 3787 length = le16_to_cpu(rx_desc->length);
3788 3788
3789 /* adjust length to remove Ethernet CRC */
3790 length -= 4;
3791
3792 if (unlikely(!(status & E1000_RXD_STAT_EOP))) { 3789 if (unlikely(!(status & E1000_RXD_STAT_EOP))) {
3793 /* All receives must fit into a single buffer */ 3790 /* All receives must fit into a single buffer */
3794 E1000_DBG("%s: Receive packet consumed multiple" 3791 E1000_DBG("%s: Receive packet consumed multiple"
@@ -3816,6 +3813,10 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
3816 } 3813 }
3817 } 3814 }
3818 3815
3816 /* adjust length to remove Ethernet CRC, this must be
3817 * done after the TBI_ACCEPT workaround above */
3818 length -= 4;
3819
3819 /* code added for copybreak, this should improve 3820 /* code added for copybreak, this should improve
3820 * performance for small packets with large amounts 3821 * performance for small packets with large amounts
3821 * of reassembly being done in the stack */ 3822 * of reassembly being done in the stack */