| Message ID | b6386f28d1ba34721795fb776a91cbdabb203447.1668807183.git.lucien.xin@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8427fd100c7b7793650e212a81e42f1cf124613d |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: sched: allow act_ct to be built without NF_NAT | expand |
Hello: This patch was applied to netdev/net.git (master) by Paolo Abeni <pabeni@redhat.com>: On Fri, 18 Nov 2022 16:33:03 -0500 you wrote: > 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> > > [...] Here is the summary with links: - [net] net: sched: allow act_ct to be built without NF_NAT https://git.kernel.org/netdev/net/c/8427fd100c7b You are awesome, thank you!
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.
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> --- net/sched/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)