diff options
author | Andy Gospodarek <andy@greyhouse.net> | 2011-02-02 14:53:25 -0800 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-03-14 10:57:06 -0400 |
commit | 445c981b0be1db5384ca0084eb38fbb92f4c6fb9 (patch) | |
tree | 16556aa51e0b69c375a590519a34f65abd6643ca /net | |
parent | ec52b9005a454e0a4e3e1c1a04222fcc0a4073fc (diff) |
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: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/core/dev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 19a74f60e4b5..1bde8b77a167 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2823,6 +2823,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; } |