aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/inet_frag.h6
-rw-r--r--net/ipv4/ip_fragment.c3
-rw-r--r--net/ipv6/netfilter/nf_conntrack_reasm.c3
-rw-r--r--net/ipv6/reassembly.c3
4 files changed, 9 insertions, 6 deletions
diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
index cf583cf7e9ef..911c2cd02941 100644
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
@@ -51,4 +51,10 @@ void inet_frag_destroy(struct inet_frag_queue *q,
51 struct inet_frags *f, int *work); 51 struct inet_frags *f, int *work);
52int inet_frag_evictor(struct inet_frags *f); 52int inet_frag_evictor(struct inet_frags *f);
53 53
54static inline void inet_frag_put(struct inet_frag_queue *q, struct inet_frags *f)
55{
56 if (atomic_dec_and_test(&q->refcnt))
57 inet_frag_destroy(q, f, NULL);
58}
59
54#endif 60#endif
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 6676600220c5..3171ec0c0fa0 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -157,8 +157,7 @@ static __inline__ struct ipq *frag_alloc_queue(void)
157 157
158static __inline__ void ipq_put(struct ipq *ipq) 158static __inline__ void ipq_put(struct ipq *ipq)
159{ 159{
160 if (atomic_dec_and_test(&ipq->q.refcnt)) 160 inet_frag_put(&ipq->q, &ip4_frags);
161 inet_frag_destroy(&ipq->q, &ip4_frags, NULL);
162} 161}
163 162
164/* Kill ipq entry. It is not destroyed immediately, 163/* Kill ipq entry. It is not destroyed immediately,
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,