Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[NETFILTER]: nf_nat: add symbolic dependency on IPv4 conntrack

Browse source 
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>
This commit is contained in:
Patrick McHardy 2007-08-07 18:12:01 -07:00 committed by David S. Miller
parent ff4ca8273e
commit 591e620693
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/net/netfilter/ipv4/nf_conntrack_ipv4.h
View file

@ -21,4 +21,6 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp;
extern int nf_conntrack_ipv4_compat_init(void);
extern void nf_conntrack_ipv4_compat_fini(void);
extern void need_ipv4_conntrack(void);
#endif /*_NF_CONNTRACK_IPV4_H*/

6
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
View file

@ -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);

2
net/ipv4/netfilter/nf_nat_standalone.c
View file

@ -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);