From 4991e3a3669a0b3a33cb376eb492ea227ea48716 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Aug 29 2024 13:16:10 +0000
Subject: Import openvswitch3.4-3.4.0-3 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.4.0.patch b/SOURCES/openvswitch-3.4.0.patch
index ad73aba..fb91663 100644
--- a/SOURCES/openvswitch-3.4.0.patch
+++ b/SOURCES/openvswitch-3.4.0.patch
@@ -198,3 +198,16 @@ index 7054cf559e..e7c8b96d49 100644
    of ``kern``, ``user``, ``mail``, ``daemon``, ``auth``, ``syslog``,
    ``lpr``, ``news``, ``uucp``, ``clock``, ``ftp``, ``ntp``, ``audit``,
    ``alert``, ``clock2``, ``local0``, ``local1``, ``local2``,
+diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c
+index 16c56608d8..529d64fe1d 100644
+--- a/lib/netdev-native-tnl.c
++++ b/lib/netdev-native-tnl.c
+@@ -254,7 +254,7 @@ dp_packet_tnl_ol_process(struct dp_packet *packet,
+ 
+             if (IP_VER(ip->ip_ihl_ver) == 4) {
+                 dp_packet_hwol_set_tx_ipv4(packet);
+-                dp_packet_hwol_tx_ip_csum(packet);
++                dp_packet_hwol_set_tx_ip_csum(packet);
+             } else if (IP_VER(ip->ip_ihl_ver) == 6) {
+                 dp_packet_hwol_set_tx_ipv6(packet);
+             }
diff --git a/SPECS/openvswitch3.4.spec b/SPECS/openvswitch3.4.spec
index 2f97c7d..e3ebae5 100644
--- a/SPECS/openvswitch3.4.spec
+++ b/SPECS/openvswitch3.4.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -770,6 +770,12 @@ exit 0
 %endif
 
 %changelog
+* Thu Aug 29 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.4.0-3
+- Merging upstream branch-3.4 [RH git: 7e8c8356c9]
+    Commit list:
+    a67c12d515 userspace: Correctly set ip offload flag in native tunneling.
+
+
 * Tue Aug 27 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.4.0-2
 - Merging upstream branch-3.4 [RH git: 0f5878ad5e]
     Commit list: