From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org, kuba@kernel.org
Subject: [PATCH net 1/8] netfilter: Remove flowtable relics
Date: Fri, 28 Jan 2022 00:52:28 +0100 [thread overview]
Message-ID: <20220127235235.656931-2-pablo@netfilter.org> (raw)
In-Reply-To: <20220127235235.656931-1-pablo@netfilter.org>
From: Geert Uytterhoeven <geert@linux-m68k.org>
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: c42ba4290b2147aa ("netfilter: flowtable: remove ipv4/ipv6 modules")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/ipv4/netfilter/Kconfig | 4 ----
net/ipv6/netfilter/Kconfig | 4 ----
net/ipv6/netfilter/Makefile | 3 ---
net/ipv6/netfilter/nf_flow_table_ipv6.c | 0
4 files changed, 11 deletions(-)
delete mode 100644 net/ipv6/netfilter/nf_flow_table_ipv6.c
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 67087f95579f..aab384126f61 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -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
diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig
index 97d3d1b36dbc..0ba62f4868f9 100644
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
@@ -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
diff --git a/net/ipv6/netfilter/Makefile b/net/ipv6/netfilter/Makefile
index b85383606df7..b8d6dc9aeeb6 100644
--- a/net/ipv6/netfilter/Makefile
+++ b/net/ipv6/netfilter/Makefile
@@ -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
diff --git a/net/ipv6/netfilter/nf_flow_table_ipv6.c b/net/ipv6/netfilter/nf_flow_table_ipv6.c
deleted file mode 100644
index e69de29bb2d1..000000000000
--
2.30.2
next prev parent reply other threads:[~2022-01-27 23:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-27 23:52 [PATCH net 0/8] Netfilter fixes for net Pablo Neira Ayuso
2022-01-27 23:52 ` Pablo Neira Ayuso [this message]
2022-01-28 3:00 ` [PATCH net 1/8] netfilter: Remove flowtable relics patchwork-bot+netdevbpf
2022-01-27 23:52 ` [PATCH net 2/8] netfilter: nft_ct: fix use after free when attaching zone template Pablo Neira Ayuso
2022-01-27 23:52 ` [PATCH net 3/8] selftests: netfilter: reduce zone stress test running time Pablo Neira Ayuso
2022-01-27 23:52 ` [PATCH net 4/8] selftests: netfilter: check stateless nat udp checksum fixup Pablo Neira Ayuso
2022-01-27 23:52 ` [PATCH net 5/8] netfilter: nft_reject_bridge: Fix for missing reply from prerouting Pablo Neira Ayuso
2022-01-27 23:52 ` [PATCH net 6/8] netfilter: nft_byteorder: track register operations Pablo Neira Ayuso
2022-01-27 23:52 ` [PATCH net 7/8] selftests: nft_concat_range: add test for reload with no element add/del Pablo Neira Ayuso
2022-01-27 23:52 ` [PATCH net 8/8] netfilter: nf_tables: remove assignment with no effect in chain blob builder Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220127235235.656931-2-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.