diff options
| author | Alexander Duyck <aduyck@mirantis.com> | 2016-02-24 09:29:57 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-24 13:58:05 -0500 |
| commit | b3c3106ce3f4646a008cd238b16f899ae14fd2a7 (patch) | |
| tree | 25b4f1cd39fd98817c1cee315e51baae5b4a5930 | |
| parent | 224516b3a798a0563346748744f8cd19feaf09be (diff) | |
| download | linux-b3c3106ce3f4646a008cd238b16f899ae14fd2a7.tar.gz linux-b3c3106ce3f4646a008cd238b16f899ae14fd2a7.tar.bz2 linux-b3c3106ce3f4646a008cd238b16f899ae14fd2a7.zip | |
flow_dissector: Use same pointer for IPv4 and IPv6 addresses
The IPv6 parsing was using a local pointer when it could use the same
pointer as the IPv4 portion of the code since the key_addrs can support
both IPv4 and IPv6 as it is just a pointer.
Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Acked-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/flow_dissector.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 6288153d7f36..7c7b8739b8b8 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -220,13 +220,12 @@ ipv6: if (dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_IPV6_ADDRS)) { - struct flow_dissector_key_ipv6_addrs *key_ipv6_addrs; - - key_ipv6_addrs = skb_flow_dissector_target(flow_dissector, - FLOW_DISSECTOR_KEY_IPV6_ADDRS, - target_container); + key_addrs = skb_flow_dissector_target(flow_dissector, + FLOW_DISSECTOR_KEY_IPV6_ADDRS, + target_container); - memcpy(key_ipv6_addrs, &iph->saddr, sizeof(*key_ipv6_addrs)); + memcpy(&key_addrs->v6addrs, &iph->saddr, + sizeof(key_addrs->v6addrs)); key_control->addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS; } |