git.openwrt.org Git - openwrt/staging/blogic.git/commit

author	Florian Westphal <fw@strlen.de>
	Tue, 19 Feb 2019 16:38:19 +0000 (17:38 +0100)
committer	Pablo Neira Ayuso <pablo@netfilter.org>
	Wed, 27 Feb 2019 09:49:24 +0000 (10:49 +0100)
commit	d1aca8ab3104aa7131f5ab144c6f586b54df084b
tree	6687b7c3de0a58cec3ebb1cc9ad274f3bd351b64	tree \| snapshot
parent	d824548dae220820bdf69b2d1561b7c4b072783f	commit \| diff

netfilter: nat: merge ipv4 and ipv6 masquerade functionality

Before:
   text    data     bss     dec     hex filename
  13916    1412    4128   19456    4c00 nf_nat.ko
   4510     968       4    5482    156a nf_nat_ipv4.ko
   5146     944       8    6098    17d2 nf_nat_ipv6.ko

After:
   text    data     bss     dec     hex filename
  16566    1576    4136   22278    5706 nf_nat.ko
   3187     844       0    4031     fbf nf_nat_ipv4.ko
   3598     844       0    4442    115a nf_nat_ipv6.ko

... so no drastic changes in combined size.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

include/net/netfilter/nf_nat.h		diff \| blob \| history
net/ipv4/netfilter/Kconfig		diff \| blob \| history
net/ipv4/netfilter/Makefile		diff \| blob \| history
net/ipv4/netfilter/nf_nat_masquerade_ipv4.c	[deleted file]	blob \| history
net/ipv6/netfilter/Kconfig		diff \| blob \| history
net/ipv6/netfilter/Makefile		diff \| blob \| history
net/ipv6/netfilter/nf_nat_masquerade_ipv6.c	[deleted file]	blob \| history
net/netfilter/Kconfig		diff \| blob \| history
net/netfilter/Makefile		diff \| blob \| history
net/netfilter/nf_nat_masquerade.c	[new file with mode: 0644]	blob