netfilter: ctnetlink: remove bogus module dependency between ctnetlink and nf_nat
authorPablo Neira Ayuso <pablo@netfilter.org>
Tue, 14 Oct 2008 18:58:31 +0000 (11:58 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Oct 2008 18:58:31 +0000 (11:58 -0700)
commite6a7d3c04f8fe49099521e6dc9a46b0272381f2f
tree4717fcfe05549d39c9281b3b23310b775ad38d16
parent129404a1f117c35c6224e020444fc27eb4479817
netfilter: ctnetlink: remove bogus module dependency between ctnetlink and nf_nat

This patch removes the module dependency between ctnetlink and
nf_nat by means of an indirect call that is initialized when
nf_nat is loaded. Now, nf_conntrack_netlink only requires
nf_conntrack and nfnetlink.

This patch puts nfnetlink_parse_nat_setup_hook into the
nf_conntrack_core to avoid dependencies between ctnetlink,
nf_conntrack_ipv4 and nf_conntrack_ipv6.

This patch also introduces the function ctnetlink_change_nat
that is only invoked from the creation path. Actually, the
nat handling cannot be invoked from the update path since
this is not allowed. By introducing this function, we remove
the useless nat handling in the update path and we avoid
deadlock-prone code.

This patch also adds the required EAGAIN logic for nfnetlink.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/netfilter/nfnetlink.h
include/net/netfilter/nf_nat_core.h
net/ipv4/netfilter/nf_nat_core.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_netlink.c
net/netfilter/nfnetlink.c