From 30125661c4e0ced1bf7dde779de6866251e61345 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jul 21 2021 15:18:15 +0000
Subject: Import openvswitch2.15-2.15.0-28 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch
index 2864451..b67f9aa 100644
--- a/SOURCES/openvswitch-2.15.0.patch
+++ b/SOURCES/openvswitch-2.15.0.patch
@@ -230,6 +230,32 @@ index fd82d7d270..bcee218005 100644
  AC_CONFIG_SRCDIR([datapath/datapath.c])
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_AUX_DIR([build-aux])
+diff --git a/datapath-windows/ovsext/Actions.c b/datapath-windows/ovsext/Actions.c
+index 4f43369844..e130c2f966 100644
+--- a/datapath-windows/ovsext/Actions.c
++++ b/datapath-windows/ovsext/Actions.c
+@@ -1550,9 +1550,21 @@ OvsUpdateAddressAndPort(OvsForwardingContext *ovsFwdCtx,
+         if (tcpHdr) {
+             portField = &tcpHdr->dest;
+             checkField = &tcpHdr->check;
++            l4Offload = isTx ? (BOOLEAN)csumInfo.Transmit.TcpChecksum :
++                        ((BOOLEAN)csumInfo.Receive.TcpChecksumSucceeded ||
++                         (BOOLEAN)csumInfo.Receive.TcpChecksumFailed);
+         } else if (udpHdr) {
+             portField = &udpHdr->dest;
+             checkField = &udpHdr->check;
++            l4Offload = isTx ? (BOOLEAN)csumInfo.Transmit.UdpChecksum :
++                        ((BOOLEAN)csumInfo.Receive.UdpChecksumSucceeded ||
++                         (BOOLEAN)csumInfo.Receive.UdpChecksumFailed);
++        }
++
++       if (l4Offload) {
++            *checkField = IPPseudoChecksum(&ipHdr->saddr, &newAddr,
++                tcpHdr ? IPPROTO_TCP : IPPROTO_UDP,
++                ntohs(ipHdr->tot_len) - ipHdr->ihl * 4);
+         }
+     }
+ 
 diff --git a/datapath-windows/ovsext/ovsext.vcxproj b/datapath-windows/ovsext/ovsext.vcxproj
 index d50a126b43..18f884f41b 100644
 --- a/datapath-windows/ovsext/ovsext.vcxproj
diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec
index 4001061..03aeac2 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: 27%{?dist}
+Release: 28%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -697,6 +697,12 @@ exit 0
 %endif
 
 %changelog
+* Wed Jul 21 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-28
+- Merging upstream branch-2.15 [RH gerrit: 48a90081e8]
+    Commit list:
+    ee4e034dc9 datapath-windows:Correct checksum for DNAT action
+
+
 * Sat Jul 17 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-27
 - Merging upstream branch-2.15 [RH gerrit: abdd952536]
     Commit list: