netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Phil Oester <kernel@linuxace.com>
To: netfilter-devel@vger.kernel.org
Cc: pablo@netfilter.org
Subject: [PATCH] netfilter: remove redundant skb check in nf_conntrack_put_reasm
Date: Wed, 19 Jun 2013 10:27:35 -0400	[thread overview]
Message-ID: <20130619142735.GA2758@gmail.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

kfree_skb already checks for skb existence - remove redundant check from
nf_conntrack_put_reasm.

Phil

Signed-off-by: Phil Oester <kernel@linuxace.com>



[-- Attachment #2: patch-put_reasm --]
[-- Type: text/plain, Size: 395 bytes --]

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index a7393ad..3da70ba 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2604,8 +2604,7 @@ static inline void nf_conntrack_get_reasm(struct sk_buff *skb)
 }
 static inline void nf_conntrack_put_reasm(struct sk_buff *skb)
 {
-	if (skb)
-		kfree_skb(skb);
+	kfree_skb(skb);
 }
 #endif
 #ifdef CONFIG_BRIDGE_NETFILTER

             reply	other threads:[~2013-06-20  3:30 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-19 14:27 Phil Oester [this message]
2013-06-20  9:22 ` [PATCH] netfilter: remove redundant skb check in nf_conntrack_put_reasm Florian Westphal
2013-06-20  9:58   ` Pablo Neira Ayuso
2013-06-20  0:01     ` Phil Oester
2013-06-20 14:15       ` Florian Westphal
2013-06-20  9:49 ` Pablo Neira Ayuso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130619142735.GA2758@gmail.com \
    --to=kernel@linuxace.com \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pablo@netfilter.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).