From patchwork Tue Aug 28 13:14:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 180489 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 582CC2C00D2 for ; Tue, 28 Aug 2012 23:14:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752407Ab2H1NOo (ORCPT ); Tue, 28 Aug 2012 09:14:44 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:33557 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752280Ab2H1NOn (ORCPT ); Tue, 28 Aug 2012 09:14:43 -0400 Received: by qaas11 with SMTP id s11so2622937qaa.19 for ; Tue, 28 Aug 2012 06:14:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=a1NKsyaMhAn/rjgyO5z8gT689FdR1KvkKn1PCyTmIUk=; b=H3e6pLRXX+vgPl5QFs4Yyz3ixNIQ9jPmm6Hy/7ycyEm3auZG4vqjJK1n9j3t1k+nOK bUqTalnqOwGKM+ACNGTGip+T++9WU+w6xVPyGdMiUSmF5O2z4ppZFT4ZpCripsyDiAPq Aixh10j0SdMtgd33f+4e0C7vgaq6VC8S4HT2Q6GJO8W3rOTqIKOk/JwHGyLfRxvy8T3T vi6tu8RiKOvR4xQkBTWDvoqwB/a58CYcMnq2D1ICjTxg3q65MvcEYyBK1Q96z22lP9r/ olj0kfp1ZVmqmNYE4LJ4xgLbVmnMNZ9y7N1Zzs/BfPEUj61hbLRf3m/6lx3lHw0j28oj zdzw== MIME-Version: 1.0 Received: by 10.224.184.20 with SMTP id ci20mr29800875qab.26.1346159683133; Tue, 28 Aug 2012 06:14:43 -0700 (PDT) Received: by 10.229.146.194 with HTTP; Tue, 28 Aug 2012 06:14:43 -0700 (PDT) Date: Tue, 28 Aug 2012 21:14:43 +0800 Message-ID: Subject: [PATCH] netfilter: remove pointless conditional before kfree_skb() From: Wei Yongjun To: pablo@netfilter.org, kaber@trash.net, kuznet@ms2.inr.ac.ru, jmorris@namei.org, yoshfuji@linux-ipv6.org Cc: yongjun_wei@trendmicro.com.cn, netfilter-devel@vger.kernel.org, netfilter@vger.kernel.org, coreteam@netfilter.org Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Wei Yongjun Remove pointless conditional before kfree_skb(). Signed-off-by: Wei Yongjun --- net/ipv6/netfilter/nf_conntrack_reasm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" 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 c9c78c2..58cf705 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -112,8 +112,7 @@ static unsigned int nf_hashfn(struct inet_frag_queue *q) static void nf_skb_free(struct sk_buff *skb) { - if (NFCT_FRAG6_CB(skb)->orig) - kfree_skb(NFCT_FRAG6_CB(skb)->orig); + kfree_skb(NFCT_FRAG6_CB(skb)->orig); } /* Destruction primitives. */