From 0a655cb861081c6c308867b6bc6ca19e12a34190 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jun 24 2022 23:06:38 +0000
Subject: Import openvswitch2.16-2.16.0-82 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.16.0.patch b/SOURCES/openvswitch-2.16.0.patch
index 471ef8b..448a215 100644
--- a/SOURCES/openvswitch-2.16.0.patch
+++ b/SOURCES/openvswitch-2.16.0.patch
@@ -8911,6 +8911,20 @@ index cdcd72c156..f652b59837 100644
  AT_BANNER([conjunctive match])
  
  AT_SETUP([single conjunctive match])
+diff --git a/tests/drop-stats.at b/tests/drop-stats.at
+index f3e19cd83b..1d3af98dab 100644
+--- a/tests/drop-stats.at
++++ b/tests/drop-stats.at
+@@ -83,6 +83,9 @@ AT_CHECK([
+     ovs-ofctl -Oopenflow13 add-flows br0 flows.txt
+     ovs-ofctl -Oopenflow13 dump-flows br0 | ofctl_strip | sort | grep actions ], [0], [ignore])
+ 
++ovs-appctl time/warp 15000
++AT_CHECK([ovs-appctl revalidator/wait])
++
+ AT_CHECK([
+     ovs-appctl netdev-dummy/receive p1 'in_port(1),packet_type(ns=0,id=0),eth(src=3a:6d:d2:09:9c:ab,dst=1e:2c:e9:2a:66:9e),ipv4(src=192.168.10.10,dst=192.168.10.30,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)'
+ ], [0], [ignore])
 diff --git a/tests/flowgen.py b/tests/flowgen.py
 index 7ef32d13cb..cb0e9df388 100755
 --- a/tests/flowgen.py
diff --git a/SPECS/openvswitch2.16.spec b/SPECS/openvswitch2.16.spec
index beb2e3b..d4ba82c 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: 81%{?dist}
+Release: 82%{?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
+* Fri Jun 24 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.16.0-82
+- Merging upstream branch-2.16 [RH git: c4dc313aae]
+    Commit list:
+    63f21bd205 drop-stats.at: Fix frequent failures of the recursion too deep test.
+
+
 * Wed Jun 15 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.16.0-81
 - Merging upstream branch-2.16 [RH git: 4e6f367244]
     Commit list: