netfilter: restore lost ifdef guarding defrag exception
authorPatrick McHardy <kaber@trash.net>
Wed, 22 Oct 2008 17:41:31 +0000 (19:41 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 10 Nov 2008 19:18:02 +0000 (11:18 -0800)
commitfda28f0c717d958e3a29fcb4bcb5e95ae8bbb4a2
tree6a7083c6e17087f8a3c2f2d2b7025547725cd03d
parent27caba5caf0f8ba55abbee157b5b96487bae1883
netfilter: restore lost ifdef guarding defrag exception

netfilter: restore lost #ifdef guarding defrag exception

Upstream commit 38f7ac3eb:

Nir Tzachar <nir.tzachar@gmail.com> reported a warning when sending
fragments over loopback with NAT:

[ 6658.338121] WARNING: at net/ipv4/netfilter/nf_nat_standalone.c:89 nf_nat_fn+0x33/0x155()

The reason is that defragmentation is skipped for already tracked connections.
This is wrong in combination with NAT and ip_conntrack actually had some ifdefs
to avoid this behaviour when NAT is compiled in.

The entire "optimization" may seem a bit silly, for now simply restoring the
lost #ifdef is the easiest solution until we can come up with something better.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c