Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ad2a6fb authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[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: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5397e97d

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+0 −2
Original line number Diff line number Diff line
@@ -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)) {