| From | Andi Kleen <> | Subject | [PATCH] [41/106] gro: reset skb_iif on reuse | Date | Tue, 26 Apr 2011 14:13:20 -0700 (PDT) |
| |
2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Andy Gospodarek <andy@greyhouse.net>
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> Signed-off-by: Andi Kleen <ak@linux.intel.com>
--- net/core/dev.c | 1 + 1 file changed, 1 insertion(+)
Index: linux-2.6.35.y/net/core/dev.c =================================================================== --- linux-2.6.35.y.orig/net/core/dev.c +++ linux-2.6.35.y/net/core/dev.c @@ -3232,6 +3232,7 @@ void napi_reuse_skb(struct napi_struct * __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; }
|