netfilter: merge meta_bridge into nft_meta
authorFlorian Westphal <fw@strlen.de>
Mon, 16 Apr 2018 17:15:53 +0000 (19:15 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 24 Apr 2018 08:29:22 +0000 (10:29 +0200)
commitbd2bbdb497dba24b9ca7f6257c83e496c64b6e9d
tree495278eb26d1521c5a14eccc5d8c371e9626df78
parent99a0efbeeb83482893f7d5df343a2d2eb591933d
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>
include/net/netfilter/nft_meta.h [deleted file]
net/bridge/netfilter/Kconfig
net/bridge/netfilter/Makefile
net/bridge/netfilter/nft_meta_bridge.c [deleted file]
net/netfilter/nft_meta.c