Message ID | 4C163643.1080906@cn.fujitsu.com |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
Le lundi 14 juin 2010 à 22:01 +0800, Shan Wei a écrit : > Eric Dumazet wrote, at 06/14/2010 05:22 PM: > > Third param (work) is unused, remove it. > > > > Remove __inline__ and inline qualifiers. > > > > Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> > > we also need to fix IPv6 netfilter. > well, 'fix' is not appropriate, there is no bug ;) > [PATCH 2/2] 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> > --- > 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 bc5b86d..9254008 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); > } > } > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Eric Dumazet wrote: > Le lundi 14 juin 2010 à 22:01 +0800, Shan Wei a écrit : > >> [PATCH 2/2] 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> > > Also applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index bc5b86d..9254008 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); } }