]>
Commit | Line | Data |
---|---|---|
ad3041a8 GKH |
1 | From foo@baz Mon Mar 27 18:18:08 CEST 2017 |
2 | From: Or Gerlitz <ogerlitz@mellanox.com> | |
3 | Date: Wed, 15 Mar 2017 18:10:47 +0200 | |
4 | Subject: net/openvswitch: Set the ipv6 source tunnel key address attribute correctly | |
5 | ||
6 | From: Or Gerlitz <ogerlitz@mellanox.com> | |
7 | ||
8 | ||
9 | [ Upstream commit 3d20f1f7bd575d147ffa75621fa560eea0aec690 ] | |
10 | ||
11 | When dealing with ipv6 source tunnel key address attribute | |
12 | (OVS_TUNNEL_KEY_ATTR_IPV6_SRC) we are wrongly setting the tunnel | |
13 | dst ip, fix that. | |
14 | ||
15 | Fixes: 6b26ba3a7d95 ('openvswitch: netlink attributes for IPv6 tunneling') | |
16 | Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com> | |
17 | Reported-by: Paul Blakey <paulb@mellanox.com> | |
18 | Acked-by: Jiri Benc <jbenc@redhat.com> | |
19 | Acked-by: Joe Stringer <joe@ovn.org> | |
20 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
21 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
22 | --- | |
23 | net/openvswitch/flow_netlink.c | 2 +- | |
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
25 | ||
26 | --- a/net/openvswitch/flow_netlink.c | |
27 | +++ b/net/openvswitch/flow_netlink.c | |
28 | @@ -588,7 +588,7 @@ static int ip_tun_from_nlattr(const stru | |
29 | ipv4 = true; | |
30 | break; | |
31 | case OVS_TUNNEL_KEY_ATTR_IPV6_SRC: | |
32 | - SW_FLOW_KEY_PUT(match, tun_key.u.ipv6.dst, | |
33 | + SW_FLOW_KEY_PUT(match, tun_key.u.ipv6.src, | |
34 | nla_get_in6_addr(a), is_mask); | |
35 | ipv6 = true; | |
36 | break; |