From: Patrick McHardy Date: Wed, 22 Oct 2008 17:41:31 +0000 (+0200) Subject: netfilter: restore lost ifdef guarding defrag exception X-Git-Tag: v2.6.27.4~10 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=373775331502999bcf0e37e8cb06488f65482939;p=pandora-kernel.git netfilter: restore lost ifdef guarding defrag exception netfilter: restore lost #ifdef guarding defrag exception Upstream commit 38f7ac3eb: Nir Tzachar 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 Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed