From fbb504726835090886cfabd80f820a0fa14dac2d Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jun 02 2023 12:52:04 +0000
Subject: Import openvswitch3.1-3.1.0-35 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch
index 11ea003..07a8c47 100644
--- a/SOURCES/openvswitch-3.1.0.patch
+++ b/SOURCES/openvswitch-3.1.0.patch
@@ -764,6 +764,19 @@ index a1a20366d..bdd12f6a7 100644
        </header>
      </diagram>
  
+diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
+index ab5b8223e..ac182436b 100644
+--- a/lib/netdev-dpdk.c
++++ b/lib/netdev-dpdk.c
+@@ -840,7 +840,7 @@ dpdk_mp_create(struct netdev_dpdk *dev, int mtu)
+ static struct dpdk_mp *
+ dpdk_mp_get(struct netdev_dpdk *dev, int mtu)
+ {
+-    struct dpdk_mp *dmp, *next;
++    struct dpdk_mp *dmp = NULL, *next;
+     bool reuse = false;
+ 
+     ovs_mutex_lock(&dpdk_mp_mutex);
 diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c
 index b89dfdd52..6c9094638 100644
 --- a/lib/netdev-native-tnl.c
diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec
index 361f2f9..0cbcd4a 100644
--- a/SPECS/openvswitch3.1.spec
+++ b/SPECS/openvswitch3.1.spec
@@ -63,7 +63,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.1.0
-Release: 34%{?dist}
+Release: 35%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -757,6 +757,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Jun 02 2023 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-35
+- Merging upstream branch-3.1 [RH git: 2eaadb8281]
+    Commit list:
+    45dba48f37 netdev-dpdk: Fix warning with gcc 13.
+
+
 * Mon May 29 2023 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-34
 - Merging upstream branch-3.1 [RH git: c5a742a597]
     Commit list: