aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-10-15 05:41:56 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-15 15:26:43 -0400
commit762cc40801ad757a34527d5e548816cf3b6fc606 (patch)
tree84bb263c67167db95120e44591f9ab8d11293f3f /net/ipv6
parent4b6cb5d8e3f5707d7a2e55cf7b05f1ea8bfc7a6d (diff)
[INET]: Consolidate the xxx_put
These ones use the generic data types too, so move them in one place. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/netfilter/nf_conntrack_reasm.c3
-rw-r--r--net/ipv6/reassembly.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index 862d089b353b..bf6f2f09eae3 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -149,8 +149,7 @@ static inline struct nf_ct_frag6_queue *frag_alloc_queue(void)
149 149
150static __inline__ void fq_put(struct nf_ct_frag6_queue *fq) 150static __inline__ void fq_put(struct nf_ct_frag6_queue *fq)
151{ 151{
152 if (atomic_dec_and_test(&fq->q.refcnt)) 152 inet_frag_put(&fq->q, &nf_frags);
153 inet_frag_destroy(&fq->q, &nf_frags, NULL);
154} 153}
155 154
156/* Kill fq entry. It is not destroyed immediately, 155/* Kill fq entry. It is not destroyed immediately,
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index 98d8fbd0c9e9..ed3c7b7912a8 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -171,8 +171,7 @@ static inline struct frag_queue *frag_alloc_queue(void)
171 171
172static __inline__ void fq_put(struct frag_queue *fq) 172static __inline__ void fq_put(struct frag_queue *fq)
173{ 173{
174 if (atomic_dec_and_test(&fq->q.refcnt)) 174 inet_frag_put(&fq->q, &ip6_frags);
175 inet_frag_destroy(&fq->q, &ip6_frags, NULL);
176} 175}
177 176
178/* Kill fq entry. It is not destroyed immediately, 177/* Kill fq entry. It is not destroyed immediately,