From 1f41f2421c6c16a8b1f1b2a41b200b38e330aed4 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Mar 28 2023 01:27:09 +0000
Subject: Import openvswitch2.16-2.16.0-114 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.16.0.patch b/SOURCES/openvswitch-2.16.0.patch
index 56b5640..1ee868f 100644
--- a/SOURCES/openvswitch-2.16.0.patch
+++ b/SOURCES/openvswitch-2.16.0.patch
@@ -83264,7 +83264,7 @@ index bddce75b63..5f90dd4ceb 100644
      return subtables_changed;
  }
 diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c
-index 34fc042373..537d3951af 100644
+index 34fc042373..26e1f33349 100644
 --- a/lib/dpif-netlink.c
 +++ b/lib/dpif-netlink.c
 @@ -84,6 +84,8 @@ enum { MAX_PORTS = USHRT_MAX };
@@ -83502,7 +83502,7 @@ index 34fc042373..537d3951af 100644
 +        n_handlers = MIN(next_prime_num, total_cores);
 +    }
 +
-+    return n_handlers;
++    return MAX(n_handlers, 1);
 +}
 +
  static int
diff --git a/SPECS/openvswitch2.16.spec b/SPECS/openvswitch2.16.spec
index bb0d63c..f30a303 100644
--- a/SPECS/openvswitch2.16.spec
+++ b/SPECS/openvswitch2.16.spec
@@ -63,7 +63,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.16.0
-Release: 113%{?dist}
+Release: 114%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -705,6 +705,12 @@ exit 0
 %endif
 
 %changelog
+* Mon Mar 27 2023 Open vSwitch CI <ovs-ci@redhat.com> - 2.16.0-114
+- Merging upstream branch-2.16 [RH git: 2c9ea01b3b]
+    Commit list:
+    9314f6c516 dpif-netlink: Always create at least 1 handler.
+
+
 * Tue Mar 07 2023 Open vSwitch CI <ovs-ci@redhat.com> - 2.16.0-113
 - Merging upstream branch-2.16 [RH git: 8acae91fa1]
     Commit list: