Skip to content

Commit

Permalink
net: sched: incorrect Kconfig dependencies on Netfilter modules
Browse files Browse the repository at this point in the history
- 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: 22a5dc0 ("net: sched: Introduce connmark action")
Fixes: 24ec483 ("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>
  • Loading branch information
Pablo Neira Ayuso authored and Jakub Kicinski committed Dec 9, 2020
1 parent c15800b commit 102e2c0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions net/sched/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ config NET_ACT_SAMPLE

config NET_ACT_IPT
tristate "IPtables targets"
depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES
depends on NET_CLS_ACT && NETFILTER && NETFILTER_XTABLES
help
Say Y here to be able to invoke iptables targets after successful
classification.
Expand Down Expand Up @@ -912,7 +912,7 @@ config NET_ACT_BPF

config NET_ACT_CONNMARK
tristate "Netfilter Connection Mark Retriever"
depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES
depends on NET_CLS_ACT && NETFILTER
depends on NF_CONNTRACK && NF_CONNTRACK_MARK
help
Say Y here to allow retrieving of conn mark
Expand All @@ -924,7 +924,7 @@ config NET_ACT_CONNMARK

config NET_ACT_CTINFO
tristate "Netfilter Connection Mark Actions"
depends on NET_CLS_ACT && NETFILTER && IP_NF_IPTABLES
depends on NET_CLS_ACT && NETFILTER
depends on NF_CONNTRACK && NF_CONNTRACK_MARK
help
Say Y here to allow transfer of a connmark stored information.
Expand Down

0 comments on commit 102e2c0

Please sign in to comment.