aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/ipv4/ip_fragment.c10
-rw-r--r--net/ipv6/netfilter/nf_conntrack_reasm.c12
-rw-r--r--net/ipv6/reassembly.c10
3 files changed, 16 insertions, 16 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index ee6e04159627..6676600220c5 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -155,10 +155,10 @@ static __inline__ struct ipq *frag_alloc_queue(void)
155 155
156/* Destruction primitives. */ 156/* Destruction primitives. */
157 157
158static __inline__ void ipq_put(struct ipq *ipq, int *work) 158static __inline__ void ipq_put(struct ipq *ipq)
159{ 159{
160 if (atomic_dec_and_test(&ipq->q.refcnt)) 160 if (atomic_dec_and_test(&ipq->q.refcnt))
161 inet_frag_destroy(&ipq->q, &ip4_frags, work); 161 inet_frag_destroy(&ipq->q, &ip4_frags, NULL);
162} 162}
163 163
164/* Kill ipq entry. It is not destroyed immediately, 164/* Kill ipq entry. It is not destroyed immediately,
@@ -208,7 +208,7 @@ static void ip_expire(unsigned long arg)
208 } 208 }
209out: 209out:
210 spin_unlock(&qp->q.lock); 210 spin_unlock(&qp->q.lock);
211 ipq_put(qp, NULL); 211 ipq_put(qp);
212} 212}
213 213
214/* Creation primitives. */ 214/* Creation primitives. */
@@ -238,7 +238,7 @@ static struct ipq *ip_frag_intern(struct ipq *qp_in)
238 atomic_inc(&qp->q.refcnt); 238 atomic_inc(&qp->q.refcnt);
239 write_unlock(&ip4_frags.lock); 239 write_unlock(&ip4_frags.lock);
240 qp_in->q.last_in |= COMPLETE; 240 qp_in->q.last_in |= COMPLETE;
241 ipq_put(qp_in, NULL); 241 ipq_put(qp_in);
242 return qp; 242 return qp;
243 } 243 }
244 } 244 }
@@ -664,7 +664,7 @@ int ip_defrag(struct sk_buff *skb, u32 user)
664 ret = ip_frag_queue(qp, skb); 664 ret = ip_frag_queue(qp, skb);
665 665
666 spin_unlock(&qp->q.lock); 666 spin_unlock(&qp->q.lock);
667 ipq_put(qp, NULL); 667 ipq_put(qp);
668 return ret; 668 return ret;
669 } 669 }
670 670
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index e4fbe5ba88f1..862d089b353b 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -147,10 +147,10 @@ static inline struct nf_ct_frag6_queue *frag_alloc_queue(void)
147 147
148/* Destruction primitives. */ 148/* Destruction primitives. */
149 149
150static __inline__ void fq_put(struct nf_ct_frag6_queue *fq, unsigned int *work) 150static __inline__ void fq_put(struct nf_ct_frag6_queue *fq)
151{ 151{
152 if (atomic_dec_and_test(&fq->q.refcnt)) 152 if (atomic_dec_and_test(&fq->q.refcnt))
153 inet_frag_destroy(&fq->q, &nf_frags, work); 153 inet_frag_destroy(&fq->q, &nf_frags, NULL);
154} 154}
155 155
156/* Kill fq entry. It is not destroyed immediately, 156/* Kill fq entry. It is not destroyed immediately,
@@ -179,7 +179,7 @@ static void nf_ct_frag6_expire(unsigned long data)
179 179
180out: 180out:
181 spin_unlock(&fq->q.lock); 181 spin_unlock(&fq->q.lock);
182 fq_put(fq, NULL); 182 fq_put(fq);
183} 183}
184 184
185/* Creation primitives. */ 185/* Creation primitives. */
@@ -201,7 +201,7 @@ static struct nf_ct_frag6_queue *nf_ct_frag6_intern(unsigned int hash,
201 atomic_inc(&fq->q.refcnt); 201 atomic_inc(&fq->q.refcnt);
202 write_unlock(&nf_frags.lock); 202 write_unlock(&nf_frags.lock);
203 fq_in->q.last_in |= COMPLETE; 203 fq_in->q.last_in |= COMPLETE;
204 fq_put(fq_in, NULL); 204 fq_put(fq_in);
205 return fq; 205 return fq;
206 } 206 }
207 } 207 }
@@ -692,7 +692,7 @@ struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb)
692 if (nf_ct_frag6_queue(fq, clone, fhdr, nhoff) < 0) { 692 if (nf_ct_frag6_queue(fq, clone, fhdr, nhoff) < 0) {
693 spin_unlock(&fq->q.lock); 693 spin_unlock(&fq->q.lock);
694 pr_debug("Can't insert skb to queue\n"); 694 pr_debug("Can't insert skb to queue\n");
695 fq_put(fq, NULL); 695 fq_put(fq);
696 goto ret_orig; 696 goto ret_orig;
697 } 697 }
698 698
@@ -703,7 +703,7 @@ struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb)
703 } 703 }
704 spin_unlock(&fq->q.lock); 704 spin_unlock(&fq->q.lock);
705 705
706 fq_put(fq, NULL); 706 fq_put(fq);
707 return ret_skb; 707 return ret_skb;
708 708
709ret_orig: 709ret_orig:
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index 02e4e855b927..98d8fbd0c9e9 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -169,10 +169,10 @@ static inline struct frag_queue *frag_alloc_queue(void)
169 169
170/* Destruction primitives. */ 170/* Destruction primitives. */
171 171
172static __inline__ void fq_put(struct frag_queue *fq, int *work) 172static __inline__ void fq_put(struct frag_queue *fq)
173{ 173{
174 if (atomic_dec_and_test(&fq->q.refcnt)) 174 if (atomic_dec_and_test(&fq->q.refcnt))
175 inet_frag_destroy(&fq->q, &ip6_frags, work); 175 inet_frag_destroy(&fq->q, &ip6_frags, NULL);
176} 176}
177 177
178/* Kill fq entry. It is not destroyed immediately, 178/* Kill fq entry. It is not destroyed immediately,
@@ -228,7 +228,7 @@ out:
228 if (dev) 228 if (dev)
229 dev_put(dev); 229 dev_put(dev);
230 spin_unlock(&fq->q.lock); 230 spin_unlock(&fq->q.lock);
231 fq_put(fq, NULL); 231 fq_put(fq);
232} 232}
233 233
234/* Creation primitives. */ 234/* Creation primitives. */
@@ -252,7 +252,7 @@ static struct frag_queue *ip6_frag_intern(struct frag_queue *fq_in)
252 atomic_inc(&fq->q.refcnt); 252 atomic_inc(&fq->q.refcnt);
253 write_unlock(&ip6_frags.lock); 253 write_unlock(&ip6_frags.lock);
254 fq_in->q.last_in |= COMPLETE; 254 fq_in->q.last_in |= COMPLETE;
255 fq_put(fq_in, NULL); 255 fq_put(fq_in);
256 return fq; 256 return fq;
257 } 257 }
258 } 258 }
@@ -677,7 +677,7 @@ static int ipv6_frag_rcv(struct sk_buff **skbp)
677 ret = ip6_frag_queue(fq, skb, fhdr, IP6CB(skb)->nhoff); 677 ret = ip6_frag_queue(fq, skb, fhdr, IP6CB(skb)->nhoff);
678 678
679 spin_unlock(&fq->q.lock); 679 spin_unlock(&fq->q.lock);
680 fq_put(fq, NULL); 680 fq_put(fq);
681 return ret; 681 return ret;
682 } 682 }
683 683