From 87850629458c949ba529c8fab9c0aba481bab28b Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Feb 10 2025 19:20:11 +0000
Subject: Import openvswitch3.5-3.5.0-0.20 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.5.0.patch b/SOURCES/openvswitch-3.5.0.patch
index 8582036..2d2c22d 100644
--- a/SOURCES/openvswitch-3.5.0.patch
+++ b/SOURCES/openvswitch-3.5.0.patch
@@ -1157,6 +1157,20 @@ index 22840a058b..5ae3794699 100644
  };
  
  /* A network device (e.g. an Ethernet device).
+diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
+index 2b2acd341d..46a62dbfc1 100644
+--- a/lib/netdev-vport.c
++++ b/lib/netdev-vport.c
+@@ -842,7 +842,8 @@ set_tunnel_config(struct netdev *dev_, const struct smap *args, char **errp)
+             }
+         } else if (!strcmp(node->key, "remote_cert") ||
+                    !strcmp(node->key, "remote_name") ||
+-                   !strcmp(node->key, "psk")) {
++                   !strcmp(node->key, "psk") ||
++                   !strncmp(node->key, "ipsec_", strlen("ipsec_"))) {
+             /* When configuring OVS for IPsec, these keys may be set in the
+                tunnel port's 'options' column. 'ovs-vswitchd' does not directly
+                use them, but they are read by 'ovs-monitor-ipsec'. In order to
 diff --git a/lib/netdev.c b/lib/netdev.c
 index 02beac9d0b..9dd94ebdd7 100644
 --- a/lib/netdev.c
@@ -1918,6 +1932,20 @@ index 3a02d737ae..b805e84dd6 100644
 +int route_table_parse(struct ofpbuf *, void *change);
 +void route_data_destroy(struct route_data *);
  #endif /* route-table.h */
+diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
+index 4cc7001a5b..e59ff17ade 100644
+--- a/ofproto/ofproto-dpif-xlate.c
++++ b/ofproto/ofproto-dpif-xlate.c
+@@ -6938,7 +6938,8 @@ rewrite_flow_push_nsh(struct xlate_ctx *ctx,
+                                "supported for packet type (%d,0x%x)",
+                                pt_ns(packet_type), pt_ns_type(packet_type));
+             ctx->error = XLATE_UNSUPPORTED_PACKET_TYPE;
+-            return buf;
++            ofpbuf_delete(buf);
++            return NULL;
+     }
+     /* Note that we have matched on packet_type! */
+     wc->masks.packet_type = OVS_BE32_MAX;
 diff --git a/python/ovs/flowviz/odp/graph.py b/python/ovs/flowviz/odp/graph.py
 index 4d1fb7493c..c9734efece 100644
 --- a/python/ovs/flowviz/odp/graph.py
diff --git a/SPECS/openvswitch3.5.spec b/SPECS/openvswitch3.5.spec
index ac912ae..53f35a7 100644
--- a/SPECS/openvswitch3.5.spec
+++ b/SPECS/openvswitch3.5.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.5.0
-Release: 0.19%{?dist}
+Release: 0.20%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -773,6 +773,13 @@ exit 0
 %endif
 
 %changelog
+* Mon Feb 10 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.5.0-0.20
+- Merging upstream branch-3.5 [RH git: 737be846fb]
+    Commit list:
+    3392e43751 netdev-vport: Ignore ipsec_ tunnel option prefix for all tunnels. (FDP-797)
+    54c3a78ef1 ofproto-dpif-xlate: Fix memory leak in xlate_generic_encap_action().
+
+
 * Sat Feb 08 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.5.0-0.19
 - Merging upstream branch-3.5 [RH git: e5eef59658]
     Commit list: