summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorAndy Gospodarek <andy@greyhouse.net>2011-02-02 14:53:25 -0800
committerDavid S. Miller <davem@davemloft.net>2011-02-02 14:53:25 -0800
commit6d152e23ad1a7a5b40fef1f42e017d66e6115159 (patch)
treec634636d5f033f0eefde9de1360624ae8972924e /net/core
parent9b6cefd6593c2b661e0052d53f2fff6fc5463975 (diff)
downloadop-kernel-dev-6d152e23ad1a7a5b40fef1f42e017d66e6115159.zip
op-kernel-dev-6d152e23ad1a7a5b40fef1f42e017d66e6115159.tar.gz
gro: reset skb_iif on reuse
Like Herbert's change from a few days ago: 66c46d741e2e60f0e8b625b80edb0ab820c46d7a gro: Reset dev pointer on reuse this may not be necessary at this point, but we should still clean up the skb->skb_iif. If not we may end up with an invalid valid for skb->skb_iif when the skb is reused and the check is done in __netif_receive_skb. Signed-off-by: Andy Gospodarek <andy@greyhouse.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 4c90789..b6d0bf8 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3426,6 +3426,7 @@ static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb)
skb_reserve(skb, NET_IP_ALIGN - skb_headroom(skb));
skb->vlan_tci = 0;
skb->dev = napi->dev;
+ skb->skb_iif = 0;
napi->skb = skb;
}
OpenPOWER on IntegriCloud