summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-02-25 04:12:44 +0100
committerDavid S. Miller <davem@davemloft.net>2012-02-25 04:12:44 +0100
commitb072342e266bcac633a8412add1644a77968ce8a (patch)
tree9c7b99872f4c0ad457334ec05791e91512e2b7c1 /drivers
parentppp: fix 'ppp_mp_reconstruct bad seq' errors (diff)
parentsfc: Fix assignment of ip_summed for pre-allocated skbs (diff)
downloadlinux-b072342e266bcac633a8412add1644a77968ce8a.tar.xz
linux-b072342e266bcac633a8412add1644a77968ce8a.zip
Merge branch 'sfc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/sfc/rx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c
index aca349861767..fc52fca74193 100644
--- a/drivers/net/ethernet/sfc/rx.c
+++ b/drivers/net/ethernet/sfc/rx.c
@@ -156,11 +156,10 @@ static int efx_init_rx_buffers_skb(struct efx_rx_queue *rx_queue)
if (unlikely(!skb))
return -ENOMEM;
- /* Adjust the SKB for padding and checksum */
+ /* Adjust the SKB for padding */
skb_reserve(skb, NET_IP_ALIGN);
rx_buf->len = skb_len - NET_IP_ALIGN;
rx_buf->is_page = false;
- skb->ip_summed = CHECKSUM_UNNECESSARY;
rx_buf->dma_addr = pci_map_single(efx->pci_dev,
skb->data, rx_buf->len,
@@ -496,6 +495,7 @@ static void efx_rx_packet_gro(struct efx_channel *channel,
EFX_BUG_ON_PARANOID(!checksummed);
rx_buf->u.skb = NULL;
+ skb->ip_summed = CHECKSUM_UNNECESSARY;
gro_result = napi_gro_receive(napi, skb);
}