From patchwork Tue Aug 28 13:14:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 180488 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 D42AF2C00D2 for ; Tue, 28 Aug 2012 23:14:19 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752203Ab2H1NOR (ORCPT ); Tue, 28 Aug 2012 09:14:17 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:51663 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752028Ab2H1NOQ (ORCPT ); Tue, 28 Aug 2012 09:14:16 -0400 Received: by qcro28 with SMTP id o28so3333526qcr.19 for ; Tue, 28 Aug 2012 06:14:15 -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=jDLdOupbzSTjhUajqNnAe2Y2glKOjtlHITiGoFnlns8=; b=fdpokB/xY71lzXDgTDw79m/M5F3KnZBrnVDfrx81SSv/dsehO25UmaBnMzGk5TL4yW TvirC14Bx2qzR2kJFYioiztyupkqQkm6sDc6Y3LFXJZvMGXZ03rmaGrXv9uOjSHzZ1/8 aWQ9dkJ7UMl8Kq6bUFBuPGJEQuOV1Pffx6vG210wmyT/cecb0tca88OURP6EnWfSciPd 8y2bHfGZiLpTX8b5/ZQNqmaWyNByhUIz5YfFsN9fZFmxygPdQbrlouEL00HERfJiiXLU e/+LIPXlI9DFIIiDtHv2LzDPVNg3AJIDu72XpICOKLejtydcVt2gLMX7gmqGjDSbYkCG iSPQ== MIME-Version: 1.0 Received: by 10.229.136.131 with SMTP id r3mr8789559qct.145.1346159655866; Tue, 28 Aug 2012 06:14:15 -0700 (PDT) Received: by 10.229.146.194 with HTTP; Tue, 28 Aug 2012 06:14:15 -0700 (PDT) Date: Tue, 28 Aug 2012 21:14:15 +0800 Message-ID: Subject: [PATCH] netfilter: nfnetlink_queue: remove pointless conditional before kfree_skb() From: Wei Yongjun To: pablo@netfilter.org, kaber@trash.net 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/netfilter/nfnetlink_queue_core.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/netfilter/nfnetlink_queue_core.c b/net/netfilter/nfnetlink_queue_core.c index c0496a5..5c2d78d 100644 --- a/net/netfilter/nfnetlink_queue_core.c +++ b/net/netfilter/nfnetlink_queue_core.c @@ -406,8 +406,7 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue, return skb; nla_put_failure: - if (skb) - kfree_skb(skb); + kfree_skb(skb); net_err_ratelimited("nf_queue: error creating packet message\n"); return NULL; }