diff options
| author |   Florian Westphal <fw@strlen.de> | 2019-01-15 22:03:38 +0100 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2019-01-18 15:02:34 +0100 |
| commit | 197c4300aec09b7cd2df124cea92f9f5a82efe42 (patch) | |
| tree | 294e4a8c35bd8eae922fe9834c803d8138a4c7b8 /net/netfilter/nf_conntrack_core.c | |
| parent | netfilter: conntrack: remove pkt_to_tuple callback (diff) | |
| download | linux-dev-197c4300aec09b7cd2df124cea92f9f5a82efe42.tar.xz linux-dev-197c4300aec09b7cd2df124cea92f9f5a82efe42.zip | |
netfilter: conntrack: remove invert_tuple callback
Only used by icmp(v6). Prefer a direct call and remove this
function from the l4proto struct.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_core.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index b71e271f2b44..d56cb0fc82b6 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -423,8 +423,12 @@ nf_ct_invert_tuple(struct nf_conntrack_tuple *inverse, inverse->dst.protonum = orig->dst.protonum; - if (unlikely(l4proto->invert_tuple)) - return l4proto->invert_tuple(inverse, orig); + switch (orig->dst.protonum) { + case IPPROTO_ICMP: + return nf_conntrack_invert_icmp_tuple(inverse, orig); + case IPPROTO_ICMPV6: + return nf_conntrack_invert_icmpv6_tuple(inverse, orig); + } inverse->src.u.all = orig->dst.u.all; inverse->dst.u.all = orig->src.u.all; |