---

yaml --- r: 298469 b: refs/heads/master c: 3b9785c h: refs/heads/master i: 298467: ce70294 v: v3
git-mirror · Mar 28, 2012 · cf69f7a · cf69f7a
1 parent 060cce7
commit cf69f7a
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: 4e7b2f1454382b220f792a7fbcbebd0985187161
+refs/heads/master: 3b9785c6b0ff37ac4ef5085b38756283da84dceb
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -1597,6 +1597,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
 		kfree_skb(skb);
 		return NET_RX_DROP;
 	}
+	skb->skb_iif = 0;
 	skb_set_dev(skb, dev);
 	skb->tstamp.tv64 = 0;
 	skb->pkt_type = PACKET_HOST;