Commit 7355bfe0 authored Jan 23, 2022 by Geert Uytterhoeven Committed by Pablo Neira Ayuso Jan 27, 2022

netfilter: Remove flowtable relics



NF_FLOW_TABLE_IPV4 and NF_FLOW_TABLE_IPV6 are invisble, selected by
nothing (so they can no longer be enabled), and their last real users
have been removed (nf_flow_table_ipv6.c is empty).

Clean up the leftovers.

Fixes: c42ba429 ("netfilter: flowtable: remove ipv4/ipv6 modules")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent 2f61353c

net/ipv4/netfilter/Kconfig

+0 −4

Original line number	Diff line number	Diff line
		@@ -58,10 +58,6 @@ config NF_TABLES_ARP

		endif # NF_TABLES

		config NF_FLOW_TABLE_IPV4
		tristate
		select NF_FLOW_TABLE_INET

		config NF_DUP_IPV4
		tristate "Netfilter IPv4 packet duplication to alternate destination"
		depends on !NF_CONNTRACK \|\| NF_CONNTRACK

net/ipv6/netfilter/Kconfig

+0 −4

Original line number	Diff line number	Diff line
		@@ -47,10 +47,6 @@ config NFT_FIB_IPV6
		endif # NF_TABLES_IPV6
		endif # NF_TABLES

		config NF_FLOW_TABLE_IPV6
		tristate
		select NF_FLOW_TABLE_INET

		config NF_DUP_IPV6
		tristate "Netfilter IPv6 packet duplication to alternate destination"
		depends on !NF_CONNTRACK \|\| NF_CONNTRACK

net/ipv6/netfilter/Makefile

+0 −3

Original line number	Diff line number	Diff line
		@@ -28,9 +28,6 @@ obj-$(CONFIG_NFT_REJECT_IPV6) += nft_reject_ipv6.o
		obj-$(CONFIG_NFT_DUP_IPV6) += nft_dup_ipv6.o
		obj-$(CONFIG_NFT_FIB_IPV6) += nft_fib_ipv6.o

		# flow table support
		obj-$(CONFIG_NF_FLOW_TABLE_IPV6) += nf_flow_table_ipv6.o

		# matches
		obj-$(CONFIG_IP6_NF_MATCH_AH) += ip6t_ah.o
		obj-$(CONFIG_IP6_NF_MATCH_EUI64) += ip6t_eui64.o

net/ipv6/netfilter/nf_flow_table_ipv6.c

deleted100644 → 0

+0 −0

Empty file deleted.