diff options
-rw-r--r-- | include/linux/skbuff.h | 4 | ||||
-rw-r--r-- | net/core/dev.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 72b396751de7..b8292d8cc9fa 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -2641,6 +2641,10 @@ static inline void nf_reset(struct sk_buff *skb) | |||
2641 | nf_bridge_put(skb->nf_bridge); | 2641 | nf_bridge_put(skb->nf_bridge); |
2642 | skb->nf_bridge = NULL; | 2642 | skb->nf_bridge = NULL; |
2643 | #endif | 2643 | #endif |
2644 | } | ||
2645 | |||
2646 | static inline void nf_reset_trace(struct sk_buff *skb) | ||
2647 | { | ||
2644 | #if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) | 2648 | #if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) |
2645 | skb->nf_trace = 0; | 2649 | skb->nf_trace = 0; |
2646 | #endif | 2650 | #endif |
diff --git a/net/core/dev.c b/net/core/dev.c index 13e6447f0398..e7d68ed8aafe 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -1639,6 +1639,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb) | |||
1639 | skb->mark = 0; | 1639 | skb->mark = 0; |
1640 | secpath_reset(skb); | 1640 | secpath_reset(skb); |
1641 | nf_reset(skb); | 1641 | nf_reset(skb); |
1642 | nf_reset_trace(skb); | ||
1642 | return netif_rx(skb); | 1643 | return netif_rx(skb); |
1643 | } | 1644 | } |
1644 | EXPORT_SYMBOL_GPL(dev_forward_skb); | 1645 | EXPORT_SYMBOL_GPL(dev_forward_skb); |