Merge pull request #5 from ballock/jb44783

[sailfish] Enable iptables match options. JB#44783
sailfishos · Dec 18, 2019 · caa459a · caa459a
2 parents 3192bd0 + 5021942
commit caa459a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/arch/x86/configs/i386_sailfish_defconfig b/arch/x86/configs/i386_sailfish_defconfig
@@ -173,7 +173,8 @@ CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
@@ -184,12 +185,19 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# upstream kernel, only CONFIG_NETFILTER_XT_MATCH_OWNER is available
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+# QTAGUID is only present on Android kernels, line below is not effective
+# on the current upstream kernel. If the kernel switches to one containing
+# the Android pqtches, and QTAGUID specifically, please set
+# CONFIG_NETFILTER_XT_MATCH_OWNER=n above first, as this option requires that.
+CONFIG_NETFILTER_XT_MATCH_QTAGUID=m
 CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=y
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -1032,6 +1040,5 @@ CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_KMEM=y
 CONFIG_NET=y
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
 CONFIG_NLS_UTF8=y
 CONFIG_SYSFS_DEPRECATED=n
diff --git a/arch/x86/configs/x86_64_sailfish_defconfig b/arch/x86/configs/x86_64_sailfish_defconfig
@@ -165,7 +165,8 @@ CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
@@ -176,12 +177,19 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# upstream kernel, only CONFIG_NETFILTER_XT_MATCH_OWNER is available
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+# QTAGUID is only present on Android kernels, line below is not effective
+# on the current upstream kernel. If the kernel switches to one containing
+# the Android pqtches, and QTAGUID specifically, please set
+# CONFIG_NETFILTER_XT_MATCH_OWNER=n above first, as this option requires that.
+CONFIG_NETFILTER_XT_MATCH_QTAGUID=m
 CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=y
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -1016,5 +1024,4 @@ CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_KMEM=y
 CONFIG_NET=y
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
 CONFIG_NLS_UTF8=y