[NETFILTER]: remove NF_CONNTRACK_ENABLED option (ab4f58c7) · Commits · 戴 / test

Remove the NF_CONNTRACK_ENABLED option. It was meant for a smoother upgrade to nf_conntrack, people having reconfigured their kernel at least once since ip_conntrack was removed will have the NF_CONNTRACK option already set. People upgrading from older kernels have to reconfigure a lot anyway. Signed-off-by:

Patrick McHardy <kaber@trash.net> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/netfilter/Kconfig

+1 −6

Original line number	Diff line number	Diff line
		@@ -25,8 +25,7 @@ config NETFILTER_NETLINK_LOG
		and is also scheduled to replace the old syslog-based ipt_LOG
		and ip6t_LOG modules.

		# Rename this to NF_CONNTRACK in a 2.6.25
		config NF_CONNTRACK_ENABLED
		config NF_CONNTRACK
		tristate "Netfilter connection tracking support"
		help
		Connection tracking keeps a record of what packets have passed
		@@ -40,10 +39,6 @@ config NF_CONNTRACK_ENABLED

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

		config NF_CONNTRACK
		tristate
		default NF_CONNTRACK_ENABLED

		config NF_CT_ACCT
		bool "Connection tracking flow accounting"
		depends on NF_CONNTRACK

Admin message