OSDN Git Service

netfilter: nat: remove l4proto->unique_tuple
authorFlorian Westphal <fw@strlen.de>
Thu, 13 Dec 2018 15:01:29 +0000 (16:01 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 17 Dec 2018 22:33:04 +0000 (23:33 +0100)
commit203f2e78200c27e42e9f7d063091f950bf5fe4a0
tree5249d1c4823cc4654004047c88edb5b5e246ce27
parent716b23c19edd47134104d39e3537d21c0b68d7d1
netfilter: nat: remove l4proto->unique_tuple

fold remaining users (icmp, icmpv6, gre) into nf_nat_l4proto_unique_tuple.
The static-save of old incarnation of resolved key in gre and icmp is
removed as well, just use the prandom based offset like the others.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/net/netfilter/nf_nat_l4proto.h
net/ipv4/netfilter/nf_nat_proto_gre.c
net/ipv4/netfilter/nf_nat_proto_icmp.c
net/ipv6/netfilter/nf_nat_proto_icmpv6.c
net/netfilter/nf_nat_core.c
net/netfilter/nf_nat_proto_unknown.c