From aab151d5201e154821bbb6705f02ffaf060b90dc Mon Sep 17 00:00:00 2001
From: Tao Huang <huangtao@rock-chips.com>
Date: Sat, 4 Apr 2020 15:54:53 +0800
Subject: [PATCH] netfilter: nf_conntrack: Call nf_conntrack_standalone_init
 early when CONFIG_ROCKCHIP_THUNDER_BOOT=y

Change-Id: I2b5a9994f83581cdd819e19abe6cabc7b1d7b3af
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
---
 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 4c94f3ba2ae4..a6053f5111a7 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -718,7 +718,11 @@ static void __exit nf_conntrack_standalone_fini(void)
 	nf_conntrack_cleanup_end();
 }
 
+#ifdef CONFIG_ROCKCHIP_THUNDER_BOOT
+rootfs_initcall(nf_conntrack_standalone_init);
+#else
 module_init(nf_conntrack_standalone_init);
+#endif
 module_exit(nf_conntrack_standalone_fini);
 
 /* Some modules need us, but don't depend directly on any symbol.