From 7a5fb8698b243181187e462bce41d3fe626bbb49 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Feb 03 2022 02:02:14 +0000
Subject: Import openvswitch2.15-2.15.0-69 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch
index fde06bd..9efdccd 100644
--- a/SOURCES/openvswitch-2.15.0.patch
+++ b/SOURCES/openvswitch-2.15.0.patch
@@ -22268,7 +22268,7 @@ index fdcb9eabbf..864c136b5d 100644
      /* Build a flow sample. */
      memset(&fs, 0, sizeof fs);
 diff --git a/ofproto/ofproto-dpif-upcall.c b/ofproto/ofproto-dpif-upcall.c
-index 5fae46adfc..ccf97266c0 100644
+index 5fae46adfc..c710a5137f 100644
 --- a/ofproto/ofproto-dpif-upcall.c
 +++ b/ofproto/ofproto-dpif-upcall.c
 @@ -491,6 +491,11 @@ udpif_destroy(struct udpif *udpif)
@@ -22283,6 +22283,20 @@ index 5fae46adfc..ccf97266c0 100644
          cmap_destroy(&udpif->ukeys[i].cmap);
          ovs_mutex_destroy(&udpif->ukeys[i].mutex);
      }
+@@ -2929,11 +2934,11 @@ upcall_unixctl_show(struct unixctl_conn *conn, int argc OVS_UNUSED,
+         }
+         ds_put_char(&ds, '\n');
+ 
+-        for (i = 0; i < n_revalidators; i++) {
++        for (i = 0; i < udpif->n_revalidators; i++) {
+             struct revalidator *revalidator = &udpif->revalidators[i];
+             int j, elements = 0;
+ 
+-            for (j = i; j < N_UMAPS; j += n_revalidators) {
++            for (j = i; j < N_UMAPS; j += udpif->n_revalidators) {
+                 elements += cmap_count(&udpif->ukeys[j].cmap);
+             }
+             ds_put_format(&ds, "  %u: (keys %d)\n", revalidator->id, elements);
 diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
 index 7108c8a301..f8a93134f9 100644
 --- a/ofproto/ofproto-dpif-xlate.c
diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec
index b5adbba..227bef5 100644
--- a/SPECS/openvswitch2.15.spec
+++ b/SPECS/openvswitch2.15.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.15.0
-Release: 68%{?dist}
+Release: 69%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -702,6 +702,12 @@ exit 0
 %endif
 
 %changelog
+* Wed Feb 02 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-69
+- Merging upstream branch-2.15 [RH git: ffd65899bd]
+    Commit list:
+    01f8e5199d ofproto-dpif-upcall: Fix n_revalidators on upcall show.
+
+
 * Mon Jan 31 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-68
 - Merging upstream branch-2.15 [RH git: df7561a258]
     Commit list: