---

yaml --- r: 362290 b: refs/heads/master c: 124dff0 h: refs/heads/master v: v3
git-mirror · Apr 5, 2013 · 6bb7c1b · 6bb7c1b
1 parent bcb9596
commit 6bb7c1b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34e2ed34a035de07277cca817fe8264324398141
+refs/heads/master: 124dff01afbdbff251f0385beca84ba1b9adda68
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
@@ -2641,6 +2641,10 @@ static inline void nf_reset(struct sk_buff *skb)
 	nf_bridge_put(skb->nf_bridge);
 	skb->nf_bridge = NULL;
 #endif
+}
+
+static inline void nf_reset_trace(struct sk_buff *skb)
+{
 #if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
 	skb->nf_trace = 0;
 #endif

diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -1639,6 +1639,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
 	skb->mark = 0;
 	secpath_reset(skb);
 	nf_reset(skb);
+	nf_reset_trace(skb);
 	return netif_rx(skb);
 }
 EXPORT_SYMBOL_GPL(dev_forward_skb);