From 6c26804782ec95d04e2c295877e73d8c5bb0b04f Mon Sep 17 00:00:00 2001
From: Ben Greear <greearb@candelatech.com>
Date: Thu, 22 Jul 2010 09:54:47 +0000
Subject: [PATCH] --- yaml --- r: 201318 b: refs/heads/master c:
 c736eefadb71a01a5e61e0de700f28f6952b4444 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 5f0572c020b8..fe86cbc5b942 100644
--- 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
index 0ea10f849be8..1f466e82ac33 100644
--- 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))) {