From 1fb1f07fabc9cbb81cbf3b1ba92576ce4cdb6671 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Sep 23 2024 10:24:52 +0000
Subject: Import openvswitch3.4-3.4.0-7 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.4.0.patch b/SOURCES/openvswitch-3.4.0.patch
index f3a47ec..2f373f6 100644
--- a/SOURCES/openvswitch-3.4.0.patch
+++ b/SOURCES/openvswitch-3.4.0.patch
@@ -226,6 +226,26 @@ index dc5164b41c..bf25e6f20a 100644
              mcast_snooping_flush_group(ms, grp);
          }
  
+diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
+index 7cced0f226..d3cd66f18a 100644
+--- a/lib/netdev-dpdk.c
++++ b/lib/netdev-dpdk.c
+@@ -1355,12 +1355,13 @@ dpdk_eth_dev_init(struct netdev_dpdk *dev)
+ 
+     if (!strcmp(info.driver_name, "net_ice")
+         || !strcmp(info.driver_name, "net_i40e")
+-        || !strcmp(info.driver_name, "net_iavf")) {
++        || !strcmp(info.driver_name, "net_iavf")
++        || !strcmp(info.driver_name, "net_txgbe")) {
+         /* FIXME: Driver advertises the capability but doesn't seem
+          * to actually support it correctly.  Can remove this once
+          * the driver is fixed on DPDK side. */
+         VLOG_INFO("%s: disabled Tx outer udp checksum offloads for a "
+-                  "net/ice, net/i40e or net/iavf port.",
++                  "net/ice, net/i40e, net/iavf or net/txgbe port.",
+                   netdev_get_name(&dev->up));
+         info.tx_offload_capa &= ~RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM;
+         info.tx_offload_capa &= ~RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO;
 diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c
 index 16c56608d8..529d64fe1d 100644
 --- a/lib/netdev-native-tnl.c
diff --git a/SPECS/openvswitch3.4.spec b/SPECS/openvswitch3.4.spec
index 358d778..0bbfacf 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: 6%{?dist}
+Release: 7%{?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
+* Mon Sep 23 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.4.0-7
+- Merging upstream branch-3.4 [RH git: d05a073041]
+    Commit list:
+    d17dbccf03 netdev-dpdk: Disable outer udp checksum offload for txgbe driver.
+
+
 * Fri Sep 20 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.4.0-6
 - Merging upstream branch-3.4 [RH git: 0037d59a9b]
     Commit list: