---

yaml --- r: 201318 b: refs/heads/master c: c736eef h: refs/heads/master v: v3
git-mirror · Jul 26, 2010 · 6c26804 · 6c26804
1 parent 869d3bf
commit 6c26804
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: 3b87956ea645fb4de7e59c7d0aa94de04be72615
+refs/heads/master: c736eefadb71a01a5e61e0de700f28f6952b4444
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -1488,6 +1488,7 @@ static inline void net_timestamp_check(struct sk_buff *skb)
 int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
 {
 	skb_orphan(skb);
+	nf_reset(skb);
 
 	if (!(dev->flags & IFF_UP) ||
 	    (skb->len > (dev->mtu + dev->hard_header_len))) {