diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index 21b477e..4627784 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -709,7 +709,7 @@ index fd82d7d270..ccfbc06639 100644 OVS_CHECK_OPENSSL OVS_CHECK_LIBCAPNG diff --git a/datapath-windows/ovsext/Actions.c b/datapath-windows/ovsext/Actions.c -index 4f43369844..70ac0a0e56 100644 +index 4f43369844..218e7db814 100644 --- a/datapath-windows/ovsext/Actions.c +++ b/datapath-windows/ovsext/Actions.c @@ -1112,9 +1112,9 @@ OvsPopFieldInPacketBuf(OvsForwardingContext *ovsFwdCtx, @@ -819,7 +819,23 @@ index 4f43369844..70ac0a0e56 100644 /* Recompute total checksum. */ *checkField = ChecksumUpdate16(*checkField, *portField, newPort); -@@ -1780,9 +1806,11 @@ OvsExecuteRecirc(OvsForwardingContext *ovsFwdCtx, +@@ -1686,6 +1712,15 @@ OvsUpdateIPv4Header(OvsForwardingContext *ovsFwdCtx, + ipHdr->ttl = ipAttr->ipv4_ttl; + key->ipKey.nwTtl = ipAttr->ipv4_ttl; + } ++ if (ipHdr->dscp != (ipAttr->ipv4_tos & 0xfc)) { ++ /* ECN + DSCP */ ++ UINT8 newTos = (ipHdr->tos & 0x3) | (ipAttr->ipv4_tos & 0xfc); ++ if (ipHdr->check != 0) { ++ ipHdr->check = ChecksumUpdate16(ipHdr->check, ipHdr->tos, newTos); ++ } ++ ipHdr->tos = newTos; ++ key->ipKey.nwTos = newTos; ++ } + + return NDIS_STATUS_SUCCESS; + } +@@ -1780,9 +1815,11 @@ OvsExecuteRecirc(OvsForwardingContext *ovsFwdCtx, } if (newNbl) { @@ -833,7 +849,7 @@ index 4f43369844..70ac0a0e56 100644 } if (deferredAction) { -@@ -1952,7 +1980,7 @@ OvsExecuteSampleAction(OvsForwardingContext *ovsFwdCtx, +@@ -1952,7 +1989,7 @@ OvsExecuteSampleAction(OvsForwardingContext *ovsFwdCtx, return STATUS_SUCCESS; } @@ -842,7 +858,7 @@ index 4f43369844..70ac0a0e56 100644 OVS_LOG_INFO( "Deferred actions limit reached, dropping sample action."); OvsCompleteNBL(ovsFwdCtx->switchContext, newNbl, TRUE); -@@ -2088,6 +2116,7 @@ OvsDoExecuteActions(POVS_SWITCH_CONTEXT switchContext, +@@ -2088,6 +2125,7 @@ OvsDoExecuteActions(POVS_SWITCH_CONTEXT switchContext, */ status = OvsPopVlanInPktBuf(&ovsFwdCtx); if (status != NDIS_STATUS_SUCCESS) { @@ -850,7 +866,7 @@ index 4f43369844..70ac0a0e56 100644 dropReason = L"OVS-pop vlan action failed"; goto dropit; } -@@ -2337,7 +2366,7 @@ OvsActionsExecute(POVS_SWITCH_CONTEXT switchContext, +@@ -2337,7 +2375,7 @@ OvsActionsExecute(POVS_SWITCH_CONTEXT switchContext, if (status == STATUS_SUCCESS) { status = OvsProcessDeferredActions(switchContext, completionList, diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index 8178491..ea80730 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: 75%{?dist} +Release: 76%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -702,6 +702,12 @@ exit 0 %endif %changelog +* Thu Feb 24 2022 Open vSwitch CI - 2.15.0-76 +- Merging upstream branch-2.15 [RH git: 9265101135] + Commit list: + 115f1543b2 datapath-windows: Fix NXM_OF_IP_TOS issue + + * Wed Feb 16 2022 Open vSwitch CI - 2.15.0-75 - Merging upstream branch-2.15 [RH git: a01913de4d] Commit list: