diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-05-19 14:24:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-05-19 14:24:16 -0700 |
| commit | 3ad2a6fb6bcc2f464cdde093a76b76b90b90c66c (patch) | |
| tree | 1ce803f80c9e3afe78e317ceba80ca4c863469ae /net | |
| parent | 5397e97d7533a03b28a7b8aeee648cbb36a8afc6 (diff) | |
| download | op-kernel-dev-3ad2a6fb6bcc2f464cdde093a76b76b90b90c66c.zip op-kernel-dev-3ad2a6fb6bcc2f464cdde093a76b76b90b90c66c.tar.gz | |
[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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | 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)) { |
