From 8205f9d8382bb9e50263e168d1c5ba3e10268d1a Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Aug 29 2024 14:31:32 +0000
Subject: Import openvswitch3.3-3.3.0-48 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch
index a979f7c..2fbc56d 100644
--- a/SOURCES/openvswitch-3.3.0.patch
+++ b/SOURCES/openvswitch-3.3.0.patch
@@ -2030,10 +2030,10 @@ index bf91ef462e..220825074b 100644
          /* The csum calculation is offloaded. */
          if (dp_packet_hwol_l4_is_tcp(b)) {
 diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c
-index dee9ab344e..0f9f07f44b 100644
+index dee9ab344e..74e89ba09e 100644
 --- a/lib/netdev-native-tnl.c
 +++ b/lib/netdev-native-tnl.c
-@@ -240,35 +240,15 @@ udp_extract_tnl_md(struct dp_packet *packet, struct flow_tnl *tnl,
+@@ -240,71 +240,31 @@ udp_extract_tnl_md(struct dp_packet *packet, struct flow_tnl *tnl,
      return udp + 1;
  }
  
@@ -2069,7 +2069,11 @@ index dee9ab344e..0f9f07f44b 100644
          if (data->tnl_type == OVS_VPORT_TYPE_GENEVE ||
              data->tnl_type == OVS_VPORT_TYPE_VXLAN) {
  
-@@ -279,32 +259,12 @@ 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.3.spec b/SPECS/openvswitch3.3.spec
index b535995..3c6f767 100644
--- a/SPECS/openvswitch3.3.spec
+++ b/SPECS/openvswitch3.3.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.3.0
-Release: 47%{?dist}
+Release: 48%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -769,6 +769,12 @@ exit 0
 %endif
 
 %changelog
+* Thu Aug 29 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.3.0-48
+- Merging upstream branch-3.3 [RH git: f9a26721d9]
+    Commit list:
+    a6b49a6a28 userspace: Correctly set ip offload flag in native tunneling.
+
+
 * Tue Aug 27 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.3.0-47
 - Merging upstream branch-3.3 [RH git: 41711102ee]
     Commit list: