From patchwork Mon Jun 14 14:01:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shan Wei X-Patchwork-Id: 55539 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4F988B7D86 for ; Tue, 15 Jun 2010 00:01:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753507Ab0FNOBq (ORCPT ); Mon, 14 Jun 2010 10:01:46 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:60205 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753234Ab0FNOBp (ORCPT ); Mon, 14 Jun 2010 10:01:45 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 12B6217011A; Mon, 14 Jun 2010 22:01:39 +0800 (CST) Received: from fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id o5EDxBwp028789; Mon, 14 Jun 2010 21:59:11 +0800 Received: from [10.167.141.214] (unknown [10.167.141.214]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id BFC3110C158; Mon, 14 Jun 2010 22:01:19 +0800 (CST) Message-ID: <4C163643.1080906@cn.fujitsu.com> Date: Mon, 14 Jun 2010 22:01:39 +0800 From: Shan Wei User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Eric Dumazet CC: David Miller , netdev , Patrick McHardy , netfilter-devel@vger.kernel.org Subject: Re: [PATCH net-next-2.6] ipfrag : frag_kfree_skb() cleanup References: <1276507363.2478.43.camel@edumazet-laptop> In-Reply-To: <1276507363.2478.43.camel@edumazet-laptop> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 we also need to fix IPv6 netfilter. [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 Acked-by: Eric Dumazet --- 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); } }