From ccd549ae22246dd3843c6b060eee53241ac9402e Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Mar 27 2023 23:46:45 +0000
Subject: Import openvswitch2.17-2.17.0-74 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch
index d98f087..ee7f07d 100644
--- a/SOURCES/openvswitch-2.17.0.patch
+++ b/SOURCES/openvswitch-2.17.0.patch
@@ -52572,7 +52572,7 @@ index 9f35713ef5..0b543cf222 100644
      dpif_netdev_enumerate,
      dpif_netdev_port_open_type,
 diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c
-index 71e35ccdda..6977888bb4 100644
+index 71e35ccdda..f95e8fa4f9 100644
 --- a/lib/dpif-netlink.c
 +++ b/lib/dpif-netlink.c
 @@ -85,7 +85,7 @@ enum { MAX_PORTS = USHRT_MAX };
@@ -52766,7 +52766,7 @@ index 71e35ccdda..6977888bb4 100644
 +        n_handlers = MIN(next_prime_num, total_cores);
 +    }
 +
-+    return n_handlers;
++    return MAX(n_handlers, 1);
 +}
 +
  static int
diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec
index b7ce8e9..7c72a4c 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: 72%{?dist}
+Release: 74%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -437,8 +437,8 @@ popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make -C build-shared install-libLTLIBRARIES DESTDIR=$RPM_BUILD_ROOT
-make -C build-static install DESTDIR=$RPM_BUILD_ROOT
+make -C build-shared install sbin_PROGRAMS=ovsdb/ovsdb-server DESTDIR=$RPM_BUILD_ROOT
+make -C build-static install bin_PROGRAMS= sbin_PROGRAMS=vswitchd/ovs-vswitchd DESTDIR=$RPM_BUILD_ROOT
 
 install -d -m 0755 $RPM_BUILD_ROOT%{_rundir}/openvswitch
 install -d -m 0750 $RPM_BUILD_ROOT%{_localstatedir}/log/openvswitch
@@ -748,6 +748,17 @@ exit 0
 %endif
 
 %changelog
+* Mon Mar 27 2023 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-74
+- Merging upstream branch-2.17 [RH git: a86c3f2963]
+    Commit list:
+    d6d1cad6a7 dpif-netlink: Always create at least 1 handler.
+
+
+* Mon Mar 20 2023 Timothy Redaelli <tredaelli@redhat.com> - 2.17.0-73
+- Install shared linked binaries (all, but ovs-vswitchd) [RH git: 590d558943] (#2159631)
+    Resolves: #2159631
+
+
 * Wed Mar 15 2023 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-72
 - Merging upstream branch-2.17 [RH git: aa069916b4]
     Commit list: