From f842780ccd778e9b2e022ba6e7f46a8fb1ed1031 Mon Sep 17 00:00:00 2001 From: Shan Wei Date: Mon, 14 Jun 2010 16:30:47 +0200 Subject: [PATCH] --- yaml --- r: 202947 b: refs/heads/master c: 0b041f8d1e6fb11a6134d37230da8c2182f99110 h: refs/heads/master i: 202945: cd7505f4558eaee13370e8c0964e2d9bdff807bd 202943: bd4a03569a77293275f902536bfd6ada19e2a103 v: v3 --- [refs] | 2 +- trunk/net/ipv6/netfilter/nf_conntrack_reasm.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4b69cb902c80..57f7835a0f44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 841a5940eb872d70dad2b9ee7f946d8fd13a8c22 +refs/heads/master: 0b041f8d1e6fb11a6134d37230da8c2182f99110 diff --git a/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c b/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c index bc5b86d477c1..9254008602d4 100644 --- a/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/trunk/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); } }