From 6bc73bd8195cf87c73840ab551a7475a56fed0b3 Mon Sep 17 00:00:00 2001 From: Andy Gospodarek Date: Wed, 2 Feb 2011 14:53:25 -0800 Subject: [PATCH] --- yaml --- r: 232876 b: refs/heads/master c: 6d152e23ad1a7a5b40fef1f42e017d66e6115159 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a9573742b0e9..528d36901388 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b6cefd6593c2b661e0052d53f2fff6fc5463975 +refs/heads/master: 6d152e23ad1a7a5b40fef1f42e017d66e6115159 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 4c907895876b..b6d0bf875a8e 100644 --- a/trunk/net/core/dev.c +++ b/trunk/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; }