aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Gospodarek <andy@greyhouse.net>2011-02-02 14:53:25 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-14 16:53:10 -0700
commite95feb47e0f0841557e88c4270ae4c332f194290 (patch)
tree9f01b7125f9fe5eb6ac545e29c70f87fb01ef976
parent9837203d1eed0af42f9633774ce143b9c91144bd (diff)
downloadlinux-linaro-stable-e95feb47e0f0841557e88c4270ae4c332f194290.tar.gz
gro: reset skb_iif on reuse
commit 6d152e23ad1a7a5b40fef1f42e017d66e6115159 upstream. 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> Signed-off-by: Brandon Philips <bphilips@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-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 88027bc121d1..d1d0ee2f1d8a 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2747,6 +2747,7 @@ void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb)
__skb_pull(skb, skb_headlen(skb));
skb_reserve(skb, NET_IP_ALIGN - skb_headroom(skb));
skb->dev = napi->dev;
+ skb->skb_iif = 0;
napi->skb = skb;
}