diff options
| author | Florian Westphal <fw@strlen.de> | 2018-12-13 16:01:29 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-12-17 23:33:04 +0100 |
| commit | 203f2e78200c27e42e9f7d063091f950bf5fe4a0 (patch) | |
| tree | 5249d1c4823cc4654004047c88edb5b5e246ce27 /net/netfilter/nf_nat_proto_unknown.c | |
| parent | 716b23c19edd47134104d39e3537d21c0b68d7d1 (diff) | |
| download | linux-203f2e78200c27e42e9f7d063091f950bf5fe4a0.tar.gz linux-203f2e78200c27e42e9f7d063091f950bf5fe4a0.tar.bz2 linux-203f2e78200c27e42e9f7d063091f950bf5fe4a0.zip | |
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>
Diffstat (limited to 'net/netfilter/nf_nat_proto_unknown.c')
| -rw-r--r-- | net/netfilter/nf_nat_proto_unknown.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/net/netfilter/nf_nat_proto_unknown.c b/net/netfilter/nf_nat_proto_unknown.c index c5db3e251232..16b66785ea5b 100644 --- a/net/netfilter/nf_nat_proto_unknown.c +++ b/net/netfilter/nf_nat_proto_unknown.c @@ -25,18 +25,6 @@ static bool unknown_in_range(const struct nf_conntrack_tuple *tuple, return true; } -static void unknown_unique_tuple(const struct nf_nat_l3proto *l3proto, - struct nf_conntrack_tuple *tuple, - const struct nf_nat_range2 *range, - enum nf_nat_manip_type maniptype, - const struct nf_conn *ct) -{ - /* Sorry: we can't help you; if it's not unique, we can't frob - * anything. - */ - return; -} - static bool unknown_manip_pkt(struct sk_buff *skb, const struct nf_nat_l3proto *l3proto, @@ -50,5 +38,4 @@ unknown_manip_pkt(struct sk_buff *skb, const struct nf_nat_l4proto nf_nat_l4proto_unknown = { .manip_pkt = unknown_manip_pkt, .in_range = unknown_in_range, - .unique_tuple = unknown_unique_tuple, }; |