]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
netfilter: defrag: kill unused work parameter of frag_kfree_skb()
authorShan Wei <shanwei@cn.fujitsu.com>
Mon, 14 Jun 2010 14:30:47 +0000 (16:30 +0200)
committerPatrick McHardy <kaber@trash.net>
Mon, 14 Jun 2010 14:30:47 +0000 (16:30 +0200)
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>
net/ipv6/netfilter/nf_conntrack_reasm.c

index bc5b86d477c1cdac9508dc6fa631f30e815e1d48..9254008602d4901d0d6f6b6813c439b1e7ef84db 100644 (file)
@@ -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);
                }
        }