From: Or Gerlitz <ogerl...@mellanox.com>

Upstream commit:
    net/openvswitch: Set the ipv6 source tunnel key address attribute correctly

    When dealing with ipv6 source tunnel key address attribute
    (OVS_TUNNEL_KEY_ATTR_IPV6_SRC) we are wrongly setting the tunnel
    dst ip, fix that.

    Fixes: 6b26ba3a7d95 ('openvswitch: netlink attributes for IPv6 tunneling')
    Signed-off-by: Or Gerlitz <ogerl...@mellanox.com>
    Reported-by: Paul Blakey <pa...@mellanox.com>
    Acked-by: Jiri Benc <jb...@redhat.com>
    Acked-by: Joe Stringer <j...@ovn.org>
    Signed-off-by: David S. Miller <da...@davemloft.net>

Upstream: 3d20f1f7bd575 ("net/openvswitch: Set the ipv6 source tunnel key 
address attribute correctly")

Signed-off-by: Andy Zhou <az...@ovn.org>
---
 AUTHORS.rst             | 1 +
 datapath/flow_netlink.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 5baee5839a2c..c8adeadccd6f 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -225,6 +225,7 @@ Nithin Raju                     nit...@vmware.com
 Niti Rohilla                    niti.rohi...@tcs.com
 Numan Siddique                  nusid...@redhat.com
 Ofer Ben-Yacov                  ofer.benya...@gmail.com
+Or Gerlitz                      ogerl...@mellanox.com
 Ori Shoshan                     ori.shos...@guardicore.com
 Padmanabhan Krishnan            kpr...@yahoo.com
 Panu Matilainen                 pmati...@redhat.com
diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c
index e2b17fb935ab..e31852ebb421 100644
--- a/datapath/flow_netlink.c
+++ b/datapath/flow_netlink.c
@@ -606,7 +606,7 @@ static int ip_tun_from_nlattr(const struct nlattr *attr,
                        ipv4 = true;
                        break;
                case OVS_TUNNEL_KEY_ATTR_IPV6_SRC:
-                       SW_FLOW_KEY_PUT(match, tun_key.u.ipv6.dst,
+                       SW_FLOW_KEY_PUT(match, tun_key.u.ipv6.src,
                                        nla_get_in6_addr(a), is_mask);
                        ipv6 = true;
                        break;
-- 
1.8.3.1

_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to