diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-10-15 02:41:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-15 12:26:43 -0700 |
| commit | 4b6cb5d8e3f5707d7a2e55cf7b05f1ea8bfc7a6d (patch) | |
| tree | 9db94b2ba84ed823305cd45c52f652760ea7809a /net/ipv6 | |
| parent | 8e7999c44ee95e1e90ac91c83557a04e2948f160 (diff) | |
[INET]: Small cleanup for xxx_put after evictor consolidation
After the evictor code is consolidated there is no need in
passing the extra pointer to the xxx_put() functions.
The only place when it made sense was the evictor code itself.
Maybe this change must got with the previous (or with the
next) patch, but I try to make them shorter as much as
possible to simplify the review (but they are still large
anyway), so this change goes in a separate patch.
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.c | 12 | ||||
| -rw-r--r-- | net/ipv6/reassembly.c | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index e4fbe5ba88f..862d089b353 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) /* Destruction primitives. */ -static __inline__ void fq_put(struct nf_ct_frag6_queue *fq, unsigned int *work) +static __inline__ void fq_put(struct nf_ct_frag6_queue *fq) { if (atomic_dec_and_test(&fq->q.refcnt)) - inet_frag_destroy(&fq->q, &nf_frags, work); + inet_frag_destroy(&fq->q, &nf_frags, NULL); } /* Kill fq entry. It is not destroyed immediately, @@ -179,7 +179,7 @@ static void nf_ct_frag6_expire(unsigned long data) out: spin_unlock(&fq->q.lock); - fq_put(fq, NULL); + fq_put(fq); } /* Creation primitives. */ @@ -201,7 +201,7 @@ static struct nf_ct_frag6_queue *nf_ct_frag6_intern(unsigned int hash, atomic_inc(&fq->q.refcnt); write_unlock(&nf_frags.lock); fq_in->q.last_in |= COMPLETE; - fq_put(fq_in, NULL); + fq_put(fq_in); return fq; } } @@ -692,7 +692,7 @@ struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb) if (nf_ct_frag6_queue(fq, clone, fhdr, nhoff) < 0) { spin_unlock(&fq->q.lock); pr_debug("Can't insert skb to queue\n"); - fq_put(fq, NULL); + fq_put(fq); goto ret_orig; } @@ -703,7 +703,7 @@ struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb) } spin_unlock(&fq->q.lock); - fq_put(fq, NULL); + fq_put(fq); return ret_skb; ret_orig: diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 02e4e855b92..98d8fbd0c9e 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c @@ -169,10 +169,10 @@ static inline struct frag_queue *frag_alloc_queue(void) /* Destruction primitives. */ -static __inline__ void fq_put(struct frag_queue *fq, int *work) +static __inline__ void fq_put(struct frag_queue *fq) { if (atomic_dec_and_test(&fq->q.refcnt)) - inet_frag_destroy(&fq->q, &ip6_frags, work); + inet_frag_destroy(&fq->q, &ip6_frags, NULL); } /* Kill fq entry. It is not destroyed immediately, @@ -228,7 +228,7 @@ out: if (dev) dev_put(dev); spin_unlock(&fq->q.lock); - fq_put(fq, NULL); + fq_put(fq); } /* Creation primitives. */ @@ -252,7 +252,7 @@ static struct frag_queue *ip6_frag_intern(struct frag_queue *fq_in) atomic_inc(&fq->q.refcnt); write_unlock(&ip6_frags.lock); fq_in->q.last_in |= COMPLETE; - fq_put(fq_in, NULL); + fq_put(fq_in); return fq; } } @@ -677,7 +677,7 @@ static int ipv6_frag_rcv(struct sk_buff **skbp) ret = ip6_frag_queue(fq, skb, fhdr, IP6CB(skb)->nhoff); spin_unlock(&fq->q.lock); - fq_put(fq, NULL); + fq_put(fq); return ret; } |