diff options
| author | Andy Gospodarek <andy@greyhouse.net> | 2011-02-02 14:53:25 -0800 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2011-04-28 08:20:59 -0700 |
| commit | e0908c530987e7df4cfb4ef7d94cd2c0e17f6b95 (patch) | |
| tree | 7b62ccfe112210e22bf3757bb7381c1cd9ea7ed1 /net | |
| parent | 760a5d738e7fe9bcdf6dd6a573541edb01a95ac2 (diff) | |
| download | linux-stable-e0908c530987e7df4cfb4ef7d94cd2c0e17f6b95.tar.gz linux-stable-e0908c530987e7df4cfb4ef7d94cd2c0e17f6b95.tar.bz2 linux-stable-e0908c530987e7df4cfb4ef7d94cd2c0e17f6b95.zip | |
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>
Signed-off-by: Andi Kleen <ak@linux.intel.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 bd6c169e2506..85e3f8dc243c 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3232,6 +3232,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; } |