From: Patrick McHardy <kaber@trash.net>
To: "David S. Miller" <davem@davemloft.net>,
Netfilter Development Mailinglist
<netfilter-devel@lists.netfilter.org>
Subject: [NETFILTER 2/2]: nf_conntrack_ipv4: fix incorrect #ifdef config name
Date: Wed, 16 May 2007 18:54:41 +0200 [thread overview]
Message-ID: <464B3751.8020902@trash.net> (raw)
[-- Attachment #1: 02.diff --]
[-- Type: text/x-diff, Size: 1423 bytes --]
[NETFILTER]: nf_conntrack_ipv4: fix incorrect #ifdef config name
The option is named CONFIG_NF_NAT not CONFIG_IP_NF_NAT. Remove the ifdef
completely since helpers also expect defragmented packet even without
NAT.
Noticed by Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
commit 4fa9ec238fd61ffd3e6f36f67ed5730db018d00c
tree 6282a1f52b4f32664c7bdc0e95f8c593cdf000b7
parent a49738a0ca6dbe54bbc6672b52286ed6b1d8f4ce
author Patrick McHardy <kaber@trash.net> Wed, 16 May 2007 18:51:44 +0200
committer Patrick McHardy <kaber@trash.net> Wed, 16 May 2007 18:51:44 +0200
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index 0654eaa..fd62a41 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -154,12 +154,10 @@ static unsigned int ipv4_conntrack_defrag(unsigned int hooknum,
const struct net_device *out,
int (*okfn)(struct sk_buff *))
{
-#if !defined(CONFIG_IP_NF_NAT) && !defined(CONFIG_IP_NF_NAT_MODULE)
/* Previously seen (loopback)? Ignore. Do this before
fragment check. */
if ((*pskb)->nfct)
return NF_ACCEPT;
-#endif
/* Gather fragments. */
if (ip_hdr(*pskb)->frag_off & htons(IP_MF | IP_OFFSET)) {
reply other threads:[~2007-05-16 16:54 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=464B3751.8020902@trash.net \
--to=kaber@trash.net \
--cc=davem@davemloft.net \
--cc=netfilter-devel@lists.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.