summaryrefslogtreecommitdiffstats
path: root/net/bridge/netfilter/Kconfig
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2018-04-16 19:15:53 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2018-04-24 10:29:22 +0200
commitbd2bbdb497dba24b9ca7f6257c83e496c64b6e9d (patch)
tree495278eb26d1521c5a14eccc5d8c371e9626df78 /net/bridge/netfilter/Kconfig
parent99a0efbeeb83482893f7d5df343a2d2eb591933d (diff)
downloadlinux-bd2bbdb497dba24b9ca7f6257c83e496c64b6e9d.tar.bz2
netfilter: merge meta_bridge into nft_meta
It overcomplicates things for no reason. nft_meta_bridge only offers retrieval of bridge port interface name. Because of this being its own module, we had to export all nft_meta functions, which we can then make static again (which even reduces the size of nft_meta -- including bridge port retrieval...): before: text data bss dec hex filename 1838 832 0 2670 a6e net/bridge/netfilter/nft_meta_bridge.ko 6147 936 1 7084 1bac net/netfilter/nft_meta.ko after: 5826 936 1 6763 1a6b net/netfilter/nft_meta.ko Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/bridge/netfilter/Kconfig')
-rw-r--r--net/bridge/netfilter/Kconfig7
1 files changed, 0 insertions, 7 deletions
diff --git a/net/bridge/netfilter/Kconfig b/net/bridge/netfilter/Kconfig
index f212447794bd..9a0159aebe1a 100644
--- a/net/bridge/netfilter/Kconfig
+++ b/net/bridge/netfilter/Kconfig
@@ -8,13 +8,6 @@ menuconfig NF_TABLES_BRIDGE
bool "Ethernet Bridge nf_tables support"
if NF_TABLES_BRIDGE
-
-config NFT_BRIDGE_META
- tristate "Netfilter nf_table bridge meta support"
- depends on NFT_META
- help
- Add support for bridge dedicated meta key.
-
config NFT_BRIDGE_REJECT
tristate "Netfilter nf_tables bridge reject support"
depends on NFT_REJECT && NFT_REJECT_IPV4 && NFT_REJECT_IPV6