net: sched: incorrect Kconfig dependencies on Netfilter modules
authorPablo Neira Ayuso <pablo@netfilter.org>
Tue, 8 Dec 2020 20:47:07 +0000 (21:47 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 23 Feb 2021 14:53:23 +0000 (15:53 +0100)
commit78b12034d4c394a9d7c9fa47c6b738fb0571b218
treecaa5124d59fbb00a4d80801fdd10ace4d901fc0f
parentf9d6533d18fd80412dc0450cf751ad144e698a23
net: sched: incorrect Kconfig dependencies on Netfilter modules

[ Upstream commit 102e2c07239c07144d9c7338ec09b9d47f2e5f79 ]

- NET_ACT_CONNMARK and NET_ACT_CTINFO only require conntrack support.
- NET_ACT_IPT only requires NETFILTER_XTABLES symbols, not
  IP_NF_IPTABLES. After this patch, NET_ACT_IPT becomes consistent
  with NET_EMATCH_IPT. NET_ACT_IPT dependency on IP_NF_IPTABLES predates
  Linux-2.6.12-rc2 (initial git repository build).

Fixes: 22a5dc0e5e3e ("net: sched: Introduce connmark action")
Fixes: 24ec483cec98 ("net: sched: Introduce act_ctinfo action")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Link: https://lore.kernel.org/r/20201208204707.11268-1-pablo@netfilter.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/sched/Kconfig