net: sched: allow act_ct to be built without NF_NAT
[ Upstream commit8427fd100c
] In commitf11fe1dae1
("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:f11fe1dae1
("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> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Родитель
a05c0f9511
Коммит
ffe6021154
|
@ -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.
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче