Преглед изворни кода

kernel: fix iptables offload build without nftables

When rebasing patches on top of 6.1, a change that removed NF_TABLES
from NF_FLOW_TABLE's dependency was dropped accidentally, and iptables
flow offload module can only be built when nftables is selected.
Restore the change to fix it.

Fixes: 19a246bb6503 ("generic: 6.1: manually refresh hack patches")
Signed-off-by: Qingfang Deng <[email protected]>
Qingfang Deng пре 1 година
родитељ
комит
27ce04a948

+ 9 - 1
target/linux/generic/hack-6.1/650-netfilter-add-xt_FLOWOFFLOAD-target.patch

@@ -8,7 +8,15 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 
 --- a/net/netfilter/Kconfig
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -1023,6 +1023,15 @@ config NETFILTER_XT_TARGET_NOTRACK
+@@ -726,7 +726,6 @@ config NF_FLOW_TABLE
+ 	tristate "Netfilter flow table module"
+ 	depends on NETFILTER_INGRESS
+ 	depends on NF_CONNTRACK
+-	depends on NF_TABLES
+ 	help
+ 	  This option adds the flow table core infrastructure.
+ 
+@@ -1023,6 +1022,15 @@ config NETFILTER_XT_TARGET_NOTRACK
  	depends on NETFILTER_ADVANCED
  	depends on NETFILTER_ADVANCED
  	select NETFILTER_XT_TARGET_CT
  	select NETFILTER_XT_TARGET_CT
  
  

+ 9 - 1
target/linux/generic/hack-6.6/650-netfilter-add-xt_FLOWOFFLOAD-target.patch

@@ -8,7 +8,15 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 
 --- a/net/netfilter/Kconfig
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -1025,6 +1025,15 @@ config NETFILTER_XT_TARGET_NOTRACK
+@@ -729,7 +729,6 @@ config NF_FLOW_TABLE
+ 	tristate "Netfilter flow table module"
+ 	depends on NETFILTER_INGRESS
+ 	depends on NF_CONNTRACK
+-	depends on NF_TABLES
+ 	help
+ 	  This option adds the flow table core infrastructure.
+ 
+@@ -1025,6 +1024,15 @@ config NETFILTER_XT_TARGET_NOTRACK
  	depends on NETFILTER_ADVANCED
  	depends on NETFILTER_ADVANCED
  	select NETFILTER_XT_TARGET_CT
  	select NETFILTER_XT_TARGET_CT