diff --git a/SOURCES/openvswitch-2.16.0.patch b/SOURCES/openvswitch-2.16.0.patch index f4fd9e9..ad89c95 100644 --- a/SOURCES/openvswitch-2.16.0.patch +++ b/SOURCES/openvswitch-2.16.0.patch @@ -2508,6 +2508,24 @@ index e4b42b0594..877bca3127 100644 int tnl_neigh_lookup(const char dev_name[IFNAMSIZ], const struct in6_addr *dst, struct eth_addr *mac); void tnl_neigh_cache_init(void); +diff --git a/ofproto/ofproto-dpif-upcall.c b/ofproto/ofproto-dpif-upcall.c +index 1c9c720f04..57f94df544 100644 +--- a/ofproto/ofproto-dpif-upcall.c ++++ b/ofproto/ofproto-dpif-upcall.c +@@ -2971,11 +2971,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 a426fcfeb6..adae3129b4 100644 --- a/ofproto/ofproto-dpif-xlate.c diff --git a/SPECS/openvswitch2.16.spec b/SPECS/openvswitch2.16.spec index 22c06cf..9c176ce 100644 --- a/SPECS/openvswitch2.16.spec +++ b/SPECS/openvswitch2.16.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.16.0 -Release: 46%{?dist} +Release: 47%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -699,6 +699,12 @@ exit 0 %endif %changelog +* Wed Feb 02 2022 Open vSwitch CI - 2.16.0-47 +- Merging upstream branch-2.16 [RH git: 6e6f66ffd0] + Commit list: + 0276bdb30a ofproto-dpif-upcall: Fix n_revalidators on upcall show. + + * Wed Feb 02 2022 Open vSwitch CI - 2.16.0-46 - Merging upstream branch-2.16 [RH git: 513117cbb0] Commit list: