| Message ID | 1296682047-15885-1-git-send-email-andy@greyhouse.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: andy@greyhouse.net Date: Wed, 2 Feb 2011 16:27:27 -0500 > 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> Applied, thanks Andy. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; }
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> --- net/core/dev.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)