Skip to content

Commit 4323362

Browse files
Jan Engelhardtkaber
authored andcommitted
netfilter: xtables: add backward-compat options
Concern has been expressed about the changing Kconfig options. Provide the old options that forward-select. Signed-off-by: Jan Engelhardt <jengelh@medozas.de> Signed-off-by: Patrick McHardy <kaber@trash.net>
1 parent 4f1c3b7 commit 4323362

File tree

2 files changed

+36
-0
lines changed

2 files changed

+36
-0
lines changed

net/ipv4/netfilter/Kconfig

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,15 @@ config IP_NF_MATCH_ECN
9292

9393
To compile it as a module, choose M here. If unsure, say N.
9494

95+
config IP_NF_MATCH_TTL
96+
tristate '"ttl" match support'
97+
depends on NETFILTER_ADVANCED
98+
select NETFILTER_XT_MATCH_HL
99+
---help---
100+
This is a backwards-compat option for the user's convenience
101+
(e.g. when running oldconfig). It selects
102+
COFNIG_NETFILTER_XT_MATCH_HL.
103+
95104
# `filter', generic and specific targets
96105
config IP_NF_FILTER
97106
tristate "Packet filtering"
@@ -313,6 +322,15 @@ config IP_NF_TARGET_ECN
313322

314323
To compile it as a module, choose M here. If unsure, say N.
315324

325+
config IP_NF_TARGET_TTL
326+
tristate '"TTL" target support'
327+
depends on NETFILTER_ADVANCED
328+
select NETFILTER_XT_TARGET_HL
329+
---help---
330+
This is a backwards-compat option for the user's convenience
331+
(e.g. when running oldconfig). It selects
332+
COFNIG_NETFILTER_XT_TARGET_HL.
333+
316334
# raw + specific targets
317335
config IP_NF_RAW
318336
tristate 'raw table support (required for NOTRACK/TRACE)'

net/ipv6/netfilter/Kconfig

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,15 @@ config IP6_NF_MATCH_OPTS
9494

9595
To compile it as a module, choose M here. If unsure, say N.
9696

97+
config IP6_NF_MATCH_HL
98+
tristate '"hl" hoplimit match support'
99+
depends on NETFILTER_ADVANCED
100+
select NETFILTER_XT_MATCH_HL
101+
---help---
102+
This is a backwards-compat option for the user's convenience
103+
(e.g. when running oldconfig). It selects
104+
COFNIG_NETFILTER_XT_MATCH_HL.
105+
97106
config IP6_NF_MATCH_IPV6HEADER
98107
tristate '"ipv6header" IPv6 Extension Headers Match'
99108
default m if NETFILTER_ADVANCED=n
@@ -121,6 +130,15 @@ config IP6_NF_MATCH_RT
121130
To compile it as a module, choose M here. If unsure, say N.
122131

123132
# The targets
133+
config IP6_NF_TARGET_HL
134+
tristate '"HL" hoplimit target support'
135+
depends on NETFILTER_ADVANCED
136+
select NETFILTER_XT_TARGET_HL
137+
---help---
138+
This is a backwards-compat option for the user's convenience
139+
(e.g. when running oldconfig). It selects
140+
COFNIG_NETFILTER_XT_TARGET_HL.
141+
124142
config IP6_NF_TARGET_LOG
125143
tristate "LOG target support"
126144
default m if NETFILTER_ADVANCED=n

0 commit comments

Comments
 (0)