aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/skbuff.h
diff options
context:
space:
mode:
authorYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>2007-03-23 14:17:27 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:27:45 -0400
commitde6e05c49f8b4ed63224c5d38891f531ecc4eabb (patch)
tree2ed69a03c657a5618bc98a5f74acb905bf764ecf /include/linux/skbuff.h
parent5f79e0f916a3bdeccc910fdf466bca582a9b2cca (diff)
[NETFILTER]: nf_conntrack: kill destroy() in struct nf_conntrack for diet
The destructor per conntrack is unnecessary, then this replaces it with system wide destructor. Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/skbuff.h')
-rw-r--r--include/linux/skbuff.h4
1 files changed, 2 insertions, 2 deletions
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)
91struct nf_conntrack { 91struct 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)
1558extern void nf_conntrack_destroy(struct nf_conntrack *nfct);
1559static inline void nf_conntrack_put(struct nf_conntrack *nfct) 1559static 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}
1564static inline void nf_conntrack_get(struct nf_conntrack *nfct) 1564static inline void nf_conntrack_get(struct nf_conntrack *nfct)
1565{ 1565{