From 901a2628b0f9b66634c5ce1fb7b816fc52ccb74f Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Fri, 14 Jul 2006 16:14:34 -0700 Subject: [PATCH] --- yaml --- r: 32705 b: refs/heads/master c: f235a2abb27b9396d2108dd2987fb8262cb508a3 h: refs/heads/master i: 32703: b0becf9ad31268ad5c6c19bd278dbacd789e3409 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9525ff1e017d..36c73e53292c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3d9e484b2ca502c87156b69fa6b8f8fd5fa18a0 +refs/heads/master: f235a2abb27b9396d2108dd2987fb8262cb508a3 diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 1c6bcad5b910..0074a3a506a5 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -3673,6 +3673,9 @@ 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" @@ -3877,8 +3880,9 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter, pci_dma_sync_single_for_device(pdev, ps_page_dma->ps_page_dma[0], PAGE_SIZE, PCI_DMA_FROMDEVICE); + /* remove the CRC */ + l1 -= 4; skb_put(skb, l1); - length += l1; goto copydone; } /* if */ } @@ -3897,6 +3901,10 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter, skb->truesize += length; } + /* strip the ethernet crc, problem is we're using pages now so + * this whole operation can get a little cpu intensive */ + pskb_trim(skb, skb->len - 4); + copydone: e1000_rx_checksum(adapter, staterr, le16_to_cpu(rx_desc->wb.lower.hi_dword.csum_ip.csum), skb);