aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/skbuff.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 62ab1ab07028..47c57be97d43 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1514,9 +1514,22 @@ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src)
1514#endif 1514#endif
1515} 1515}
1516 1516
1517static inline void nf_copy(struct sk_buff *dst, const struct sk_buff *src)
1518{
1519 nf_conntrack_put(dst->nfct);
1520#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
1521 nf_conntrack_put_reasm(dst->nfct_reasm);
1522#endif
1523#ifdef CONFIG_BRIDGE_NETFILTER
1524 nf_bridge_put(dst->nf_bridge);
1525#endif
1526 __nf_copy(dst, src);
1527}
1528
1517#else /* CONFIG_NETFILTER */ 1529#else /* CONFIG_NETFILTER */
1518static inline void nf_reset(struct sk_buff *skb) {} 1530static inline void nf_reset(struct sk_buff *skb) {}
1519static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src) {} 1531static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src) {}
1532static inline void nf_copy(struct sk_buff *dst, const struct sk_buff *src) {}
1520#endif /* CONFIG_NETFILTER */ 1533#endif /* CONFIG_NETFILTER */
1521 1534
1522#ifdef CONFIG_NETWORK_SECMARK 1535#ifdef CONFIG_NETWORK_SECMARK