From cf2efe1a3c0eff020fd93b9db98f85860486ee91 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jan 17 2022 17:51:43 +0000
Subject: Import openvswitch2.16-2.16.0-37 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.16.0.patch b/SOURCES/openvswitch-2.16.0.patch
index aa9ed13..1d8a561 100644
--- a/SOURCES/openvswitch-2.16.0.patch
+++ b/SOURCES/openvswitch-2.16.0.patch
@@ -2410,6 +2410,18 @@ index a426fcfeb6..bb22d29034 100644
              break;
          }
          }
+diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
+index cba49a99e1..c012cebae1 100644
+--- a/ofproto/ofproto-dpif.c
++++ b/ofproto/ofproto-dpif.c
+@@ -6496,6 +6496,7 @@ ofproto_unixctl_dpif_show_dp_features(struct unixctl_conn *conn,
+ 
+     dpif_show_support(&ofproto->backer->bt_support, &ds);
+     unixctl_command_reply(conn, ds_cstr(&ds));
++    ds_destroy(&ds);
+ }
+ 
+ static void
 diff --git a/ofproto/ofproto-provider.h b/ofproto/ofproto-provider.h
 index 57c7d17cb2..14b909973d 100644
 --- a/ofproto/ofproto-provider.h
diff --git a/SPECS/openvswitch2.16.spec b/SPECS/openvswitch2.16.spec
index a9aaec5..9511e49 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: 36%{?dist}
+Release: 37%{?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
+* Mon Jan 17 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.16.0-37
+- Merging upstream branch-2.16 [RH git: c9297f5ef7]
+    Commit list:
+    29936a853f ofproto-dpif: Fix memory leak in dpif/show-dp-features appctl.
+
+
 * Thu Jan 13 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.16.0-36
 - Merging upstream branch-2.16 [RH git: edae801e00]
     Commit list: