---

yaml --- r: 232876 b: refs/heads/master c: 6d152e2 h: refs/heads/master v: v3
git-mirror · Feb 2, 2011 · 6bc73bd · 6bc73bd
1 parent c2b795c
commit 6bc73bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;
 }