summaryrefslogtreecommitdiffstats
path: root/net/sched
diff options
context:
space:
mode:
authorXin Long <lucien.xin@gmail.com>2022-11-18 22:33:03 +0100
committerPaolo Abeni <pabeni@redhat.com>2022-11-22 12:16:55 +0100
commit8427fd100c7b7793650e212a81e42f1cf124613d (patch)
tree1d52448febd6ff2ddbc057fa4bfdaf22f76b5bc6 /net/sched
parentnet: sparx5: fix error handling in sparx5_port_open() (diff)
downloadlinux-8427fd100c7b7793650e212a81e42f1cf124613d.tar.xz
linux-8427fd100c7b7793650e212a81e42f1cf124613d.zip
net: sched: allow act_ct to be built without NF_NAT
In commit f11fe1dae1c4 ("net/sched: Make NET_ACT_CT depends on NF_NAT"), it fixed the build failure when NF_NAT is m and NET_ACT_CT is y by adding depends on NF_NAT for NET_ACT_CT. However, it would also cause NET_ACT_CT cannot be built without NF_NAT, which is not expected. This patch fixes it by changing to use "(!NF_NAT || NF_NAT)" as the depend. Fixes: f11fe1dae1c4 ("net/sched: Make NET_ACT_CT depends on NF_NAT") Signed-off-by: Xin Long <lucien.xin@gmail.com> Link: https://lore.kernel.org/r/b6386f28d1ba34721795fb776a91cbdabb203447.1668807183.git.lucien.xin@gmail.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index 1e8ab4749c6c..4662a6ce8a7e 100644
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -976,7 +976,7 @@ config NET_ACT_TUNNEL_KEY
config NET_ACT_CT
tristate "connection tracking tc action"
- depends on NET_CLS_ACT && NF_CONNTRACK && NF_NAT && NF_FLOW_TABLE
+ depends on NET_CLS_ACT && NF_CONNTRACK && (!NF_NAT || NF_NAT) && NF_FLOW_TABLE
help
Say Y here to allow sending the packets to conntrack module.