From 4c5a3179fe7f1a71382e2fb7b74da5f246829fa6 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jun 19 2024 18:23:25 +0000
Subject: Import openvswitch2.17-2.17.0-159 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch
index c6c23d7..1c846d2 100644
--- a/SOURCES/openvswitch-2.17.0.patch
+++ b/SOURCES/openvswitch-2.17.0.patch
@@ -97649,6 +97649,21 @@ index 29041fa3e3..d8483af40d 100644
  
      free(argcopy);
      return 0;
+diff --git a/lib/dpdk.c b/lib/dpdk.c
+index 6886fbd9d5..7c86544fce 100644
+--- a/lib/dpdk.c
++++ b/lib/dpdk.c
+@@ -414,7 +414,9 @@ dpdk_init__(const struct smap *ovs_other_config)
+     }
+ #endif
+ 
+-    if (args_contains(&args, "-c") || args_contains(&args, "-l")) {
++    if (args_contains(&args, "-c") ||
++        args_contains(&args, "-l") ||
++        args_contains(&args, "--lcores")) {
+         auto_determine = false;
+     }
+ 
 diff --git a/lib/dpif-netdev-avx512.c b/lib/dpif-netdev-avx512.c
 index b7131ba3f1..82a4138184 100644
 --- a/lib/dpif-netdev-avx512.c
diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec
index b365f29..360d94f 100644
--- a/SPECS/openvswitch2.17.spec
+++ b/SPECS/openvswitch2.17.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.17.0
-Release: 158%{?dist}
+Release: 159%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -751,6 +751,12 @@ exit 0
 %endif
 
 %changelog
+* Wed Jun 19 2024 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-159
+- Merging upstream branch-2.17 [RH git: 1f8a72dac2]
+    Commit list:
+    1bd8526818 dpdk: Check other_config:dpdk-extra for '--lcores'.
+
+
 * Fri Jun 07 2024 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-158
 - Merging upstream branch-2.17 [RH git: ed8dddd40b]
     Commit list: