shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

netfilter: nf_conntrack: Call nf_conntrack_standalone_init() early when CONFIG_INITCALL_ASYNC=y

Browse Source 
nf_nat_amanda_init() depends on nf_conntrack_standalone_init() to init nf_ct_nat_helpers.
But nf_nat_amanda_init() and nf_conntrack_standalone_init() are both in the same
module_init level.

Fix this by moving nf_conntrack_standalone_init() to the rootfs_initcall level.

Change-Id: I2b5a9994f83581cdd819e19abe6cabc7b1d7b3af
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
This commit is contained in:
Tao Huang
2020-04-04 15:54:53 +08:00
parent a0f44c9df3
commit 81d1cc82ea
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/netfilter/nf_conntrack_standalone.c
View File

@@ -1250,5 +1250,9 @@ static void __exit nf_conntrack_standalone_fini(void)
nf_conntrack_cleanup_end();
}
#ifdef CONFIG_INITCALL_ASYNC
rootfs_initcall(nf_conntrack_standalone_init);
#else
module_init(nf_conntrack_standalone_init);
#endif
module_exit(nf_conntrack_standalone_fini);