]> git.karo-electronics.de Git - karo-tx-linux.git/commit
netfilter: restore lost #ifdef guarding defrag exception
authorPatrick McHardy <kaber@trash.net>
Tue, 14 Oct 2008 18:56:59 +0000 (11:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Oct 2008 18:56:59 +0000 (11:56 -0700)
commit38f7ac3eb7206ffd1201c14baba832d7e363de0a
treecd195d19a0c16f3cd59f4afe0526a86c1db5322d
parent485013717020cd8961337309e359d6cef43d6022
netfilter: restore lost #ifdef guarding defrag exception

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: David S. Miller <davem@davemloft.net>
net/ipv4/netfilter/nf_defrag_ipv4.c