diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-08-07 18:12:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-08-07 18:12:01 -0700 |
| commit | 591e620693e71e24fb3450a4084217e44b7a60b6 (patch) | |
| tree | e651e7beaca45a99b89bd63d33419c5b97477a28 /net | |
| parent | ff4ca8273eafbba875a86d333e059e78f292107f (diff) | |
| download | linux-3.10-591e620693e71e24fb3450a4084217e44b7a60b6.tar.gz linux-3.10-591e620693e71e24fb3450a4084217e44b7a60b6.tar.bz2 linux-3.10-591e620693e71e24fb3450a4084217e44b7a60b6.zip | |
[NETFILTER]: nf_nat: add symbolic dependency on IPv4 conntrack
Loading nf_nat causes the conntrack core to be loaded, but we need IPv4 as
well.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 6 | ||||
| -rw-r--r-- | net/ipv4/netfilter/nf_nat_standalone.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c index 64552afd01c..d9b5177989c 100644 --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c @@ -509,3 +509,9 @@ static void __exit nf_conntrack_l3proto_ipv4_fini(void) module_init(nf_conntrack_l3proto_ipv4_init); module_exit(nf_conntrack_l3proto_ipv4_fini); + +void need_ipv4_conntrack(void) +{ + return; +} +EXPORT_SYMBOL_GPL(need_ipv4_conntrack); diff --git a/net/ipv4/netfilter/nf_nat_standalone.c b/net/ipv4/netfilter/nf_nat_standalone.c index 332814dac50..46cc99def16 100644 --- a/net/ipv4/netfilter/nf_nat_standalone.c +++ b/net/ipv4/netfilter/nf_nat_standalone.c @@ -328,7 +328,7 @@ static int __init nf_nat_standalone_init(void) { int ret = 0; - need_conntrack(); + need_ipv4_conntrack(); #ifdef CONFIG_XFRM BUG_ON(ip_nat_decode_session != NULL); |