aboutsummaryrefslogtreecommitdiff
path: root/target/linux/generic/hack-6.1
diff options
context:
space:
mode:
authorQingfang Deng <dqfext@gmail.com>2024-03-12 10:05:13 +0800
committerHauke Mehrtens <hauke@hauke-m.de>2024-03-23 17:33:24 +0100
commit27ce04a94867e870ffa1c753e531571054f2358f (patch)
tree63e929cb0cdc026c8f1424e88385353e0bb1e7b6 /target/linux/generic/hack-6.1
parent686cc58c10a48b58a9eef601f3697c9ec4019da6 (diff)
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 <dqfext@gmail.com>
Diffstat (limited to 'target/linux/generic/hack-6.1')
-rw-r--r--target/linux/generic/hack-6.1/650-netfilter-add-xt_FLOWOFFLOAD-target.patch10
1 files changed, 9 insertions, 1 deletions
diff --git a/target/linux/generic/hack-6.1/650-netfilter-add-xt_FLOWOFFLOAD-target.patch b/target/linux/generic/hack-6.1/650-netfilter-add-xt_FLOWOFFLOAD-target.patch
index 1dfd556ce8..6fdfc79207 100644
--- a/target/linux/generic/hack-6.1/650-netfilter-add-xt_FLOWOFFLOAD-target.patch
+++ b/target/linux/generic/hack-6.1/650-netfilter-add-xt_FLOWOFFLOAD-target.patch
@@ -8,7 +8,15 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/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
select NETFILTER_XT_TARGET_CT