| commit | 8419d2eafe89d96cc9e5212dd9effa241ae391bc | |
| author | Patrick McHardy <kaber@trash.net> | |
| Wed, 22 Oct 2008 17:41:31 +0000 (22 19:41 +0200) | ||
| committer | Greg Kroah-Hartman <gregkh@suse.de> | |
| Mon, 10 Nov 2008 18:50:08 +0000 (10 10:50 -0800) | ||
| tree | dccf857125b6a835987ecdd68222bdceccb23c27 | treesnapshot (tar.gz zip) |
| parent | 1f1b1c633ad952ea13eb36a09c6edb4748967d07 | commitdiff |
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>
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 | diffblobblamehistory |