From 81d1cc82ea19c652339cf929b71e15dee728e04d Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Sat, 4 Apr 2020 15:54:53 +0800 Subject: [PATCH] netfilter: nf_conntrack: Call nf_conntrack_standalone_init() early when CONFIG_INITCALL_ASYNC=y 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 --- net/netfilter/nf_conntrack_standalone.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c index 52245dbfae31..28d957860dda 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -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);