From 07765aa68aa2ee347cac7afaae6d2287d2a386f0 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Feb 03 2022 01:47:20 +0000
Subject: Import openvswitch2.13-2.13.0-155 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch
index 1814ec3..085e0aa 100644
--- a/SOURCES/openvswitch-2.13.0.patch
+++ b/SOURCES/openvswitch-2.13.0.patch
@@ -86647,7 +86647,7 @@ index f9ea47a2f1..6324e74d52 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 409286ab15..cb197e9010 100644
+index 409286ab15..61d5cf9782 100644
 --- a/ofproto/ofproto-dpif-upcall.c
 +++ b/ofproto/ofproto-dpif-upcall.c
 @@ -1093,7 +1093,7 @@ compose_slow_path(struct udpif *udpif, struct xlate_out *xout,
@@ -86669,6 +86669,20 @@ index 409286ab15..cb197e9010 100644
              flow_get_metadata(&frozen_flow, &am->pin.up.base.flow_metadata);
  
              ofproto_dpif_send_async_msg(upcall->ofproto, am);
+@@ -2888,11 +2889,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 4407f9c97a..97fcbb6584 100644
 --- a/ofproto/ofproto-dpif-xlate.c
diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec
index d748b7e..0922d65 100644
--- a/SPECS/openvswitch2.13.spec
+++ b/SPECS/openvswitch2.13.spec
@@ -59,7 +59,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.13.0
-Release: 154%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist}
+Release: 155%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -715,6 +715,12 @@ exit 0
 %endif
 
 %changelog
+* Wed Feb 02 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-155
+- Merging upstream branch-2.13 [RH git: 4d9e93b316]
+    Commit list:
+    62ebef0816 ofproto-dpif-upcall: Fix n_revalidators on upcall show.
+
+
 * Mon Jan 31 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-154
 - Merging upstream branch-2.13 [RH git: 7c20278b9e]
     Commit list: