From 6932645548debd83377d9f346e50d537ca067f97 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jul 26 2021 03:31:19 +0000
Subject: Import openvswitch2.15-2.15.0-30 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch
index 44c997c..0dddcbc 100644
--- a/SOURCES/openvswitch-2.15.0.patch
+++ b/SOURCES/openvswitch-2.15.0.patch
@@ -18584,6 +18584,18 @@ index 88f4c7e28c..b59cba962a 100644
 +int ct_dpif_get_features(struct dpif *dpif, enum ct_features *features);
  
  #endif /* CT_DPIF_H */
+diff --git a/lib/daemon-unix.c b/lib/daemon-unix.c
+index ae59ecf2c2..34d45b82a1 100644
+--- a/lib/daemon-unix.c
++++ b/lib/daemon-unix.c
+@@ -285,6 +285,7 @@ fork_and_wait_for_startup(int *fdp, pid_t *child_pid)
+                     VLOG_ERR("fork child died before signaling startup (%s)",
+                              status_msg);
+                     ret = -1;
++                    free(status_msg);
+                 }
+             } else if (retval < 0) {
+                 VLOG_FATAL("waitpid failed (%s)", ovs_strerror(errno));
 diff --git a/lib/dp-packet.h b/lib/dp-packet.h
 index 9e2d06b3dd..cb3f30e5b6 100644
 --- a/lib/dp-packet.h
@@ -19243,6 +19255,23 @@ index 6be23dbeed..0ab511b60d 100644
      unsigned int bps = ((uint64_t) kbits_rate * 1000) / 8;
      struct tc_police police;
      struct tc_ratespec rate;
+diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c
+index f2413f5be6..0e4119c0a6 100644
+--- a/lib/netdev-offload-dpdk.c
++++ b/lib/netdev-offload-dpdk.c
+@@ -503,8 +503,11 @@ dump_flow_action(struct ds *s, struct ds *s_extra,
+ 
+         ds_put_format(s, "set_ipv6_%s ", dirstr);
+         if (set_ipv6) {
++            struct in6_addr addr;
++
+             ds_put_cstr(s, "ipv6_addr ");
+-            ipv6_format_addr((struct in6_addr *) &set_ipv6->ipv6_addr, s);
++            memcpy(&addr, set_ipv6->ipv6_addr, sizeof addr);
++            ipv6_format_addr(&addr, s);
+             ds_put_cstr(s, " ");
+         }
+         ds_put_cstr(s, "/ ");
 diff --git a/lib/netdev-offload-tc.c b/lib/netdev-offload-tc.c
 index 72b7915052..32f52b46f2 100644
 --- a/lib/netdev-offload-tc.c
diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec
index 6a365f4..e74c04e 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: 29%{?dist}
+Release: 30%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -697,6 +697,13 @@ exit 0
 %endif
 
 %changelog
+* Mon Jul 26 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-30
+- Merging upstream branch-2.15 [RH gerrit: a76a4dfca6]
+    Commit list:
+    8d84a4b166 netdev-offload-dpdk: Fix IPv6 rewrite cast-align warning.
+    f3f7849cbb daemon-unix: Fix leak of a fork error message.
+
+
 * Fri Jul 23 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-29
 - Merging upstream branch-2.15 [RH gerrit: 60c8b2a15b]
     Commit list: