summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2018-12-13 16:01:29 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2018-12-17 23:33:04 +0100
commit203f2e78200c27e42e9f7d063091f950bf5fe4a0 (patch)
tree5249d1c4823cc4654004047c88edb5b5e246ce27 /include/net
parent716b23c19edd47134104d39e3537d21c0b68d7d1 (diff)
downloadlinux-stable-203f2e78200c27e42e9f7d063091f950bf5fe4a0.tar.gz
linux-stable-203f2e78200c27e42e9f7d063091f950bf5fe4a0.tar.bz2
linux-stable-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 'include/net')
-rw-r--r--include/net/netfilter/nf_nat_l4proto.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/include/net/netfilter/nf_nat_l4proto.h b/include/net/netfilter/nf_nat_l4proto.h
index 96f0794bb1f8..4a0e4f0623a0 100644
--- a/include/net/netfilter/nf_nat_l4proto.h
+++ b/include/net/netfilter/nf_nat_l4proto.h
@@ -27,17 +27,6 @@ struct nf_nat_l4proto {
const union nf_conntrack_man_proto *min,
const union nf_conntrack_man_proto *max);
- /* Alter the per-proto part of the tuple (depending on
- * maniptype), to give a unique tuple in the given range if
- * possible. Per-protocol part of tuple is initialized to the
- * incoming packet.
- */
- void (*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);
-
int (*nlattr_to_range)(struct nlattr *tb[],
struct nf_nat_range2 *range);
};