removed IgnoreOrder

microsoft · Dec 3, 2024 · 5fdcc8d · 5fdcc8d
1 parent e7b4add
commit 5fdcc8d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 9 deletions.
diff --git a/src/core/connection.c b/src/core/connection.c
@@ -5233,7 +5233,7 @@ QuicConnRecvFrames(
             }
 
             Connection->NextRecvAckFreqSeqNum = Frame.SequenceNumber + 1;
-            Connection->State.IgnoreReordering = Frame.IgnoreOrder;
+            Connection->State.IgnoreReordering = Frame.ReorderingThreshold == 0;
             if (Frame.UpdateMaxAckDelay == 0) {
                 Connection->Settings.MaxAckDelayMs = 0;
             } else if (Frame.UpdateMaxAckDelay < 1000) {

diff --git a/src/core/frame.c b/src/core/frame.c
@@ -1238,7 +1238,6 @@ typedef struct QUIC_ACK_FREQUENCY_EXTRAS {
 
     union {
         struct {
-            uint8_t IgnoreOrder : 1;
             uint8_t IgnoreCE    : 1;
             uint8_t Reserved    : 6;
         };
@@ -1268,11 +1267,9 @@ QuicAckFrequencyFrameEncode(
         return FALSE;
     }
 
-    CXPLAT_DBG_ASSERT(Frame->IgnoreOrder <= 1); // IgnoreOrder should only be 0 or 1.
     CXPLAT_DBG_ASSERT(Frame->IgnoreCE <= 1);    // IgnoreCE should only be 0 or 1.
 
     QUIC_ACK_FREQUENCY_EXTRAS Extras = { .Value = 0 };
-    Extras.IgnoreOrder = Frame->IgnoreOrder;
     Extras.IgnoreCE = Frame->IgnoreCE;
 
     Buffer = Buffer + *Offset;
@@ -1305,7 +1302,6 @@ QuicAckFrequencyFrameDecode(
         !QuicUint8tDecode(BufferLength, Buffer, Offset, &Extras.Value)) {
         return FALSE;
     }
-    Frame->IgnoreOrder = Extras.IgnoreOrder;
     Frame->IgnoreCE = Extras.IgnoreCE;
     return TRUE;
 }
@@ -1966,15 +1962,14 @@ QuicFrameLog(
 
         QuicTraceLogVerbose(
             FrameLogAckFrequency,
-            "[%c][%cX][%llu]   ACK_FREQUENCY SeqNum:%llu PktTolerance:%llu MaxAckDelay:%llu ReorderThreshold:%llu IgnoreOrder:%hhu IgnoreCE:%hhu",
+            "[%c][%cX][%llu]   ACK_FREQUENCY SeqNum:%llu PktTolerance:%llu MaxAckDelay:%llu ReorderThreshold:%llu IgnoreCE:%hhu",
             PtkConnPre(Connection),
             PktRxPre(Rx),
             PacketNumber,
             Frame.SequenceNumber,
             Frame.PacketTolerance,
             Frame.UpdateMaxAckDelay,
             Frame.ReorderingThreshold,
-            Frame.IgnoreOrder,
             Frame.IgnoreCE);
         break;
     }

diff --git a/src/core/frame.h b/src/core/frame.h
@@ -847,7 +847,6 @@ typedef struct QUIC_ACK_FREQUENCY_EX {
     QUIC_VAR_INT PacketTolerance;
     QUIC_VAR_INT UpdateMaxAckDelay; // In microseconds (us)
     QUIC_VAR_INT ReorderingThreshold;
-    BOOLEAN IgnoreOrder;
     BOOLEAN IgnoreCE;
 
 } QUIC_ACK_FREQUENCY_EX;

diff --git a/src/core/send.c b/src/core/send.c
@@ -897,7 +897,6 @@ QuicSendWriteFrames(
             Frame.PacketTolerance = Connection->PeerPacketTolerance;
             Frame.UpdateMaxAckDelay = MS_TO_US(QuicConnGetAckDelay(Connection));
             Frame.ReorderingThreshold = Connection->PeerReorderingThreshold;
-            Frame.IgnoreOrder = FALSE;
             Frame.IgnoreCE = FALSE;
 
             if (QuicAckFrequencyFrameEncode(