[PATCH] netfilter: Remove some backward-compat Kconfig symbols

[PATCH] netfilter: Remove some backward-compat Kconfig symbols

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 2235 bytes --]

Since Linux 3.4 or earlier, CONFIG_IP_NF_MATCH_ECN,
CONFIG_IP_NF_MATCH_TTL, CONFIG_IP_NF_TARGET_TTL have just selected the
xtables replacements for these symbols.  They should not be needed
any more.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 net/ipv4/netfilter/Kconfig | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 1657e39b..a6cedb0 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -60,15 +60,6 @@ config IP_NF_MATCH_AH
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
-config IP_NF_MATCH_ECN
-	tristate '"ecn" match support'
-	depends on NETFILTER_ADVANCED
-	select NETFILTER_XT_MATCH_ECN
-	---help---
-	This is a backwards-compat option for the user's convenience
-	(e.g. when running oldconfig). It selects
-	CONFIG_NETFILTER_XT_MATCH_ECN.
-
 config IP_NF_MATCH_RPFILTER
 	tristate '"rpfilter" reverse path filter match support'
 	depends on NETFILTER_ADVANCED && (IP_NF_MANGLE || IP_NF_RAW)
@@ -79,15 +70,6 @@ config IP_NF_MATCH_RPFILTER
 	  To compile it as a module, choose M here.  If unsure, say N.
 	  The module will be called ipt_rpfilter.
 
-config IP_NF_MATCH_TTL
-	tristate '"ttl" match support'
-	depends on NETFILTER_ADVANCED
-	select NETFILTER_XT_MATCH_HL
-	---help---
-	This is a backwards-compat option for the user's convenience
-	(e.g. when running oldconfig). It selects
-	CONFIG_NETFILTER_XT_MATCH_HL.
-
 # `filter', generic and specific targets
 config IP_NF_FILTER
 	tristate "Packet filtering"
@@ -268,15 +250,6 @@ config IP_NF_TARGET_ECN
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
-config IP_NF_TARGET_TTL
-	tristate '"TTL" target support'
-	depends on NETFILTER_ADVANCED && IP_NF_MANGLE
-	select NETFILTER_XT_TARGET_HL
-	---help---
-	This is a backwards-compatible option for the user's convenience
-	(e.g. when running oldconfig). It selects
-	CONFIG_NETFILTER_XT_TARGET_HL.
-
 # raw + specific targets
 config IP_NF_RAW
 	tristate  'raw table support (required for NOTRACK/TRACE)'

-- 
Ben Hutchings
Logic doesn't apply to the real world. - Marvin Minsky

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

Re: [PATCH] netfilter: Remove some backward-compat Kconfig symbols

[Pablo Neira Ayuso]

On Mon, Dec 30, 2013 at 12:43:51AM +0100, Ben Hutchings wrote:
> Since Linux 3.4 or earlier, CONFIG_IP_NF_MATCH_ECN,
> CONFIG_IP_NF_MATCH_TTL, CONFIG_IP_NF_TARGET_TTL have just selected the
> xtables replacements for these symbols.  They should not be needed
> any more.

3.2-stable is already in place, I think those users can still benefit
from this compat stuff.