netfilter: nf_tables: merge route type into core
authorFlorian Westphal <fw@strlen.de>
Wed, 27 Mar 2019 08:22:25 +0000 (09:22 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 8 Apr 2019 21:01:42 +0000 (23:01 +0200)
commitc1deb065cf3b5bcd483e3f03479f930edb151b99
tree2fd53ec6848c117a9b56e26842e425236832e3bb
parentd164385ec572cbe3335a635ac308760e126d4ec0
netfilter: nf_tables: merge route type into core

very little code, so it really doesn't make sense to have extra
modules or even a kconfig knob for this.

Merge them and make functionality available unconditionally.
The merge makes inet family route support trivial, so add it
as well here.

Before:
   text    data     bss     dec     hex filename
    835     832       0    1667     683 nft_chain_route_ipv4.ko
    870     832       0    1702     6a6 nft_chain_route_ipv6.ko
 111568    2556     529  114653   1bfdd nf_tables.ko

After:
   text    data     bss     dec     hex filename
 113133    2556     529  116218   1c5fa nf_tables.ko

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
12 files changed:
include/linux/netfilter_ipv6.h
include/net/netfilter/nf_tables.h
net/ipv4/netfilter/Kconfig
net/ipv4/netfilter/Makefile
net/ipv4/netfilter/nft_chain_route_ipv4.c [deleted file]
net/ipv6/netfilter/Kconfig
net/ipv6/netfilter/Makefile
net/ipv6/netfilter/nft_chain_route_ipv6.c [deleted file]
net/netfilter/Makefile
net/netfilter/nf_nat_proto.c
net/netfilter/nf_tables_api.c
net/netfilter/nft_chain_route.c [new file with mode: 0644]