netfilter: conntrack: gre: switch module to be built-in
authorFlorian Westphal <fw@strlen.de>
Tue, 15 Jan 2019 21:03:35 +0000 (22:03 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 18 Jan 2019 14:02:33 +0000 (15:02 +0100)
commit22fc4c4c9fd60427bcda00878cee94e7622cfa7a
treeaff1c2dd0a7345d86eed1b05d80d5887a127f02a
parent202e651cd43c69a43f75b445e90f55b59f9af0ad
netfilter: conntrack: gre: switch module to be built-in

This makes the last of the modular l4 trackers 'bool'.

After this, all infrastructure to handle dynamic l4 protocol registration
becomes obsolete and can be removed in followup patches.

Old:
302824 net/netfilter/nf_conntrack.ko
 21504 net/netfilter/nf_conntrack_proto_gre.ko

New:
313728 net/netfilter/nf_conntrack.ko

Old:
   text    data     bss     dec     hex filename
   6281    1732       4    8017    1f51 nf_conntrack_proto_gre.ko
 108356   20613     236  129205   1f8b5 nf_conntrack.ko
New:
 112095   21381     240  133716   20a54 nf_conntrack.ko

The size increase is only temporary.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/linux/netfilter/nf_conntrack_proto_gre.h
include/net/netfilter/ipv4/nf_conntrack_ipv4.h
include/net/netfilter/nf_conntrack_l4proto.h
include/net/netns/conntrack.h
net/netfilter/Kconfig
net/netfilter/Makefile
net/netfilter/nf_conntrack_proto.c
net/netfilter/nf_conntrack_proto_gre.c
net/netfilter/nfnetlink_cttimeout.c