diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/netfilter.h | 1 | ||||
-rw-r--r-- | include/linux/skbuff.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index 4777f1b619ce..10b5c6275706 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h | |||
@@ -393,6 +393,7 @@ nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, int family) {} | |||
393 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) | 393 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) |
394 | extern void (*ip_ct_attach)(struct sk_buff *, struct sk_buff *); | 394 | extern void (*ip_ct_attach)(struct sk_buff *, struct sk_buff *); |
395 | extern void nf_ct_attach(struct sk_buff *, struct sk_buff *); | 395 | extern void nf_ct_attach(struct sk_buff *, struct sk_buff *); |
396 | extern void (*nf_ct_destroy)(struct nf_conntrack *); | ||
396 | #else | 397 | #else |
397 | static inline void nf_ct_attach(struct sk_buff *new, struct sk_buff *skb) {} | 398 | static inline void nf_ct_attach(struct sk_buff *new, struct sk_buff *skb) {} |
398 | #endif | 399 | #endif |
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 0bedf5384850..37247901ebd2 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -90,7 +90,6 @@ struct net_device; | |||
90 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) | 90 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) |
91 | struct nf_conntrack { | 91 | struct nf_conntrack { |
92 | atomic_t use; | 92 | atomic_t use; |
93 | void (*destroy)(struct nf_conntrack *); | ||
94 | }; | 93 | }; |
95 | #endif | 94 | #endif |
96 | 95 | ||
@@ -1556,10 +1555,11 @@ static inline unsigned int skb_checksum_complete(struct sk_buff *skb) | |||
1556 | } | 1555 | } |
1557 | 1556 | ||
1558 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) | 1557 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) |
1558 | extern void nf_conntrack_destroy(struct nf_conntrack *nfct); | ||
1559 | static inline void nf_conntrack_put(struct nf_conntrack *nfct) | 1559 | static inline void nf_conntrack_put(struct nf_conntrack *nfct) |
1560 | { | 1560 | { |
1561 | if (nfct && atomic_dec_and_test(&nfct->use)) | 1561 | if (nfct && atomic_dec_and_test(&nfct->use)) |
1562 | nfct->destroy(nfct); | 1562 | nf_conntrack_destroy(nfct); |
1563 | } | 1563 | } |
1564 | static inline void nf_conntrack_get(struct nf_conntrack *nfct) | 1564 | static inline void nf_conntrack_get(struct nf_conntrack *nfct) |
1565 | { | 1565 | { |