From 811847a8fdd173961865fd7b06d8a7d35b13fcd2 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Feb 28 2025 19:24:10 +0000
Subject: Import openvswitch3.5-3.5.0-6 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.5.0.patch b/SOURCES/openvswitch-3.5.0.patch
index b38ad99..acc929c 100644
--- a/SOURCES/openvswitch-3.5.0.patch
+++ b/SOURCES/openvswitch-3.5.0.patch
@@ -36,6 +36,23 @@ index 1ba7afbf40..ad638cc44f 100644
  openvswitch (3.5.0-1) unstable; urgency=low
  
     * New upstream version
+diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
+index e59ff17ade..d9962765f1 100644
+--- a/ofproto/ofproto-dpif-xlate.c
++++ b/ofproto/ofproto-dpif-xlate.c
+@@ -3925,9 +3925,9 @@ native_tunnel_output(struct xlate_ctx *ctx, const struct xport *xport,
+                      "sending %s request",
+                      buf_dip6, out_dev->xbridge->name, d_ip ? "ARP" : "ND");
+ 
+-        err = ovs_router_get_netdev_source_address(&d_ip6,
+-                                                   out_dev->xbridge->name,
+-                                                   &nh_s_ip6);
++        err = ovs_router_get_netdev_source_address(
++            &d_ip6, netdev_get_name(out_dev->netdev), &nh_s_ip6);
++
+         if (err) {
+             nh_s_ip6 = s_ip6;
+         }
 diff --git a/dpdk/VERSION b/dpdk/VERSION
 index 0a492611a0..9e2934aa34 100644
 --- a/dpdk/VERSION
diff --git a/SPECS/openvswitch3.5.spec b/SPECS/openvswitch3.5.spec
index 7aef7ba..ca73d71 100644
--- a/SPECS/openvswitch3.5.spec
+++ b/SPECS/openvswitch3.5.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.5.0
-Release: 4%{?dist}
+Release: 6%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -75,10 +75,11 @@ License: ASL 2.0 and LGPLv2+ and SISSL
 %define dpdkarches
 %endif
 
+%define ovsver 3.5.0
 %if 0%{?commit:1}
 Source: https://github.com/openvswitch/ovs/archive/%{commit}.tar.gz#/openvswitch-%{commit}.tar.gz
 %else
-Source: https://github.com/openvswitch/ovs/archive/v%{version}.tar.gz#/openvswitch-%{version}.tar.gz
+Source: https://github.com/openvswitch/ovs/archive/v%{ovsver}.tar.gz#/openvswitch-%{ovsver}.tar.gz
 %endif
 Source2: openvswitch.sysusers
 Source3: openvswitch-hugetlbfs.sysusers
@@ -93,7 +94,7 @@ Source101: https://pypi.io/packages/source/P/Pygments/Pygments-%{pygmentsver}.ta
 Source102: https://pypi.io/packages/source/S/Sphinx/Sphinx-%{sphinxver}.tar.gz
 Source103: https://pypi.io/packages/source/p/pyelftools/pyelftools-%{pyelftoolsver}.tar.gz
 
-Patch0:    openvswitch-%{version}.patch
+Patch0:    openvswitch-%{ovsver}.patch
 
 # The DPDK is designed to optimize througput of network traffic using, among
 # other techniques, carefully crafted assembly instructions.  As such it
@@ -252,20 +253,20 @@ This package provides IPsec tunneling support for OVS tunnels.
 %if 0%{?commit:1}
 %setup -q -n ovs-%{commit} -a 10
 %else
-%setup -q -n ovs-%{version} -a 10
+%setup -q -n ovs-%{ovsver} -a 10
 %endif
 %if ! %{external_sphinx}
 %if 0%{?commit:1}
 %setup -n ovs-%{commit} -q -D -T -a 100 -a 101 -a 102
 %else
-%setup -n ovs-%{version} -q -D -T -a 100 -a 101 -a 102
+%setup -n ovs-%{ovsver} -q -D -T -a 100 -a 101 -a 102
 %endif
 %endif
 %if 0%{?rhel} && 0%{?rhel} < 9
 %if 0%{?commit:1}
 %setup -n ovs-%{commit} -q -D -T -a 103
 %else
-%setup -n ovs-%{version} -q -D -T -a 103
+%setup -n ovs-%{ovsver} -q -D -T -a 103
 %endif
 %endif
 
@@ -787,6 +788,18 @@ exit 0
 %endif
 
 %changelog
+* Fri Feb 28 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.5.0-6
+- Merging upstream branch-3.5 [RH git: af1bdb9d4d]
+    Commit list:
+    490d0377d9 ofproto-dpif-xlate: Fix source IP lookup for non-bridge ports.
+
+
+* Fri Feb 28 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.5.0-5
+- Merging redhat subtree [RH git: 08d09fdb13]
+    Commit list:
+    48fbd3b1cd Fix patch version management
+
+
 * Thu Feb 20 2025 Timothy Redaelli <tredaelli@redhat.com> - 3.5.0-4
 - Add include.mk that points to official 3.5.0 [RH git: c4891390f4]