]> err.no Git - linux-2.6/commit
[NETFILTER]: nf_nat: fix ICMP translation with statically linked conntrack
authorPatrick McHardy <kaber@trash.net>
Fri, 26 Jan 2007 09:06:47 +0000 (01:06 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 26 Jan 2007 09:06:47 +0000 (01:06 -0800)
commitc72c6b2a291bb6c61b1546d116784a79e15a6c29
tree3e7369188a531b805908e1a200e76126af914af9
parente89862f4c5b3c4ac9afcd8cb1365d2f1e16ddc3b
[NETFILTER]: nf_nat: fix ICMP translation with statically linked conntrack

When nf_nat/nf_conntrack_ipv4 are linked statically, nf_nat is initialized
before nf_conntrack_ipv4, which makes the nf_ct_l3proto_find_get(AF_INET)
call during nf_nat initialization return the generic l3proto instead of
the AF_INET specific one. This breaks ICMP error translation since the
generic protocol always initializes the IPs in the tuple to 0.

Change the linking order and put nf_conntrack_ipv4 first.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/netfilter/Makefile