Commit 8ce22fca authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: Remove some EXPERIMENTAL dependencies 



Most of the netfilter modules are not considered experimental anymore,
the only ones I want to keep marked as EXPERIMENTAL are:

- TCPOPTSTRIP target, which is brand new.

- SANE helper, which is quite new.

- CLUSTERIP target, which I believe hasn't had much testing despite
  being in the kernel for quite a long time.

- SCTP match and conntrack protocol, which are a mess and need to
  be reviewed and cleaned up before I would trust them.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b26e76b7

net/ipv4/netfilter/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -229,8 +229,8 @@ config IP_NF_TARGET_NETMAP 
	  To compile it as a module, choose M here.  If unsure, say N.



config NF_NAT_SNMP_BASIC

	tristate "Basic SNMP-ALG support (EXPERIMENTAL)"

	depends on EXPERIMENTAL && NF_NAT

	tristate "Basic SNMP-ALG support"

	depends on NF_NAT

	depends on NETFILTER_ADVANCED

	---help---

net/ipv6/netfilter/Kconfig

+6 −6
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 
# IP netfilter configuration

#



menu "IPv6: Netfilter Configuration (EXPERIMENTAL)"

	depends on INET && IPV6 && NETFILTER && EXPERIMENTAL

menu "IPv6: Netfilter Configuration"

	depends on INET && IPV6 && NETFILTER



config NF_CONNTRACK_IPV6

	tristate "IPv6 connection tracking support (EXPERIMENTAL)"

	depends on INET && IPV6 && EXPERIMENTAL && NF_CONNTRACK

	tristate "IPv6 connection tracking support"

	depends on INET && IPV6 && NF_CONNTRACK

	default m if NETFILTER_ADVANCED=n

	---help---

	  Connection tracking keeps a record of what packets have passed
@@ -22,7 +22,7 @@ config NF_CONNTRACK_IPV6 


config IP6_NF_QUEUE

	tristate "IP6 Userspace queueing via NETLINK (OBSOLETE)"

	depends on INET && IPV6 && NETFILTER && EXPERIMENTAL

	depends on INET && IPV6 && NETFILTER

	depends on NETFILTER_ADVANCED

	---help---
@@ -44,7 +44,7 @@ config IP6_NF_QUEUE 


config IP6_NF_IPTABLES

	tristate "IP6 tables support (required for filtering)"

	depends on INET && IPV6 && EXPERIMENTAL

	depends on INET && IPV6

	select NETFILTER_XTABLES

	default m if NETFILTER_ADVANCED=n

	help

net/netfilter/Kconfig

+12 −12
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ config NF_CONNTRACK_SECMARK 
	  If unsure, say 'N'.



config NF_CONNTRACK_EVENTS

	bool "Connection tracking events (EXPERIMENTAL)"

	depends on EXPERIMENTAL && NF_CONNTRACK

	bool "Connection tracking events"

	depends on NF_CONNTRACK

	depends on NETFILTER_ADVANCED

	help

	  If this option is enabled, the connection tracking code will
@@ -102,8 +102,8 @@ config NF_CT_PROTO_SCTP 
	  <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.



config NF_CT_PROTO_UDPLITE

	tristate 'UDP-Lite protocol connection tracking support (EXPERIMENTAL)'

	depends on EXPERIMENTAL && NF_CONNTRACK

	tristate 'UDP-Lite protocol connection tracking support'

	depends on NF_CONNTRACK

	depends on NETFILTER_ADVANCED

	help

	  With this option enabled, the layer 3 independent connection
@@ -144,8 +144,8 @@ config NF_CONNTRACK_FTP 
	  To compile it as a module, choose M here.  If unsure, say N.



config NF_CONNTRACK_H323

	tristate "H.323 protocol support (EXPERIMENTAL)"

	depends on EXPERIMENTAL && NF_CONNTRACK && (IPV6 || IPV6=n)

	tristate "H.323 protocol support"

	depends on NF_CONNTRACK && (IPV6 || IPV6=n)

	depends on NETFILTER_ADVANCED

	help

	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
@@ -180,8 +180,8 @@ config NF_CONNTRACK_IRC 
	  To compile it as a module, choose M here.  If unsure, say N.



config NF_CONNTRACK_NETBIOS_NS

	tristate "NetBIOS name service protocol support (EXPERIMENTAL)"

	depends on EXPERIMENTAL && NF_CONNTRACK

	tristate "NetBIOS name service protocol support"

	depends on NF_CONNTRACK

	depends on NETFILTER_ADVANCED

	help

	  NetBIOS name service requests are sent as broadcast messages from an
@@ -234,8 +234,8 @@ config NF_CONNTRACK_SANE 
	  To compile it as a module, choose M here.  If unsure, say N.



config NF_CONNTRACK_SIP

	tristate "SIP protocol support (EXPERIMENTAL)"

	depends on EXPERIMENTAL && NF_CONNTRACK

	tristate "SIP protocol support"

	depends on NF_CONNTRACK

	default m if NETFILTER_ADVANCED=n

	help

	  SIP is an application-layer control protocol that can establish,
@@ -259,8 +259,8 @@ config NF_CONNTRACK_TFTP 
	  To compile it as a module, choose M here.  If unsure, say N.



config NF_CT_NETLINK

	tristate 'Connection tracking netlink interface (EXPERIMENTAL)'

	depends on EXPERIMENTAL && NF_CONNTRACK

	tristate 'Connection tracking netlink interface'

	depends on NF_CONNTRACK

	select NETFILTER_NETLINK

	depends on NF_NAT=n || NF_NAT

	default m if NETFILTER_ADVANCED=n

CRA Git | Maintained and supported by SUSTech CRA and CCSE