diff options
| author | Shan Wei <shanwei@cn.fujitsu.com> | 2010-06-14 16:30:47 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-06-14 16:30:47 +0200 |
| commit | 0b041f8d1e6fb11a6134d37230da8c2182f99110 (patch) | |
| tree | 72472564e377285159800b882c9c36ad19bf26d4 /net/ipv6 | |
| parent | 841a5940eb872d70dad2b9ee7f946d8fd13a8c22 (diff) | |
| download | linux-stable-0b041f8d1e6fb11a6134d37230da8c2182f99110.tar.gz linux-stable-0b041f8d1e6fb11a6134d37230da8c2182f99110.tar.bz2 linux-stable-0b041f8d1e6fb11a6134d37230da8c2182f99110.zip | |
netfilter: defrag: kill unused work parameter of frag_kfree_skb()
The parameter (work) is unused, remove it.
Reported from Eric Dumazet.
Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/netfilter/nf_conntrack_reasm.c | 6 |
1 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 bc5b86d477c1..9254008602d4 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -114,10 +114,8 @@ static void nf_skb_free(struct sk_buff *skb) } /* Memory Tracking Functions. */ -static inline void frag_kfree_skb(struct sk_buff *skb, unsigned int *work) +static void frag_kfree_skb(struct sk_buff *skb) { - if (work) - *work -= skb->truesize; atomic_sub(skb->truesize, &nf_init_frags.mem); nf_skb_free(skb); kfree_skb(skb); @@ -335,7 +333,7 @@ static int nf_ct_frag6_queue(struct nf_ct_frag6_queue *fq, struct sk_buff *skb, fq->q.fragments = next; fq->q.meat -= free_it->len; - frag_kfree_skb(free_it, NULL); + frag_kfree_skb(free_it); } } |