1. Add DPC protocol and DpcLib library in MdeModulePkg.

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Tcp4Dxe / Tcp4Output.c

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c
index f2987e769c4bf17c169ede2fbced3eff7fed0a3a..707bc3ada3b08727c5c67b2ab355ae07b4e455ec 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c
@@ -144,7 +144,7 @@ TcpComputeWnd (
     Tcb->RcvWnd = Wnd;\r
   }\r
 \r
-  Wnd = NET_MIN (Wnd >> Tcb->RcvWndScale, 0xffff);\r
+  Wnd = MIN (Wnd >> Tcb->RcvWndScale, 0xffff);\r
   return NTOHS ((UINT16) Wnd);\r
 }\r
 \r
@@ -230,7 +230,7 @@ TcpDataToSend (
   Left  = GET_SND_DATASIZE (Sk) +\r
           TCP_SUB_SEQ (TcpGetMaxSndNxt (Tcb), Tcb->SndNxt);\r
 \r
-  Len   = NET_MIN (Win, Left);\r
+  Len   = MIN (Win, Left);\r
 \r
   if (Len > Tcb->SndMss) {\r
     Len = Tcb->SndMss;\r
@@ -379,7 +379,7 @@ TcpTransmitSegment (
       Seg->Urg = (UINT16) TCP_SUB_SEQ (Tcb->SndUp, Seg->Seq);\r
     } else {\r
 \r
-      Seg->Urg = (UINT16) NET_MIN (\r
+      Seg->Urg = (UINT16) MIN (\r
                             TCP_SUB_SEQ (Tcb->SndUp,\r
                             Seg->Seq),\r
                             0xffff\r
@@ -686,7 +686,7 @@ TcpRetransmit (
   }\r
 \r
   Len   = TCP_SUB_SEQ (Tcb->SndWl2 + Tcb->SndWnd, Seq);\r
-  Len   = NET_MIN (Len, Tcb->SndMss);\r
+  Len   = MIN (Len, Tcb->SndMss);\r
 \r
   Nbuf  = TcpGetSegmentSndQue (Tcb, Seq, Len);\r
   if (Nbuf == NULL) {\r
@@ -1003,6 +1003,9 @@ TcpToSendAck (
   IN TCP_CB *Tcb\r
   )\r
 {\r
+  UINT32 TcpNow;\r
+\r
+  TcpNow = TcpRcvWinNow (Tcb);\r
   //\r
   // Generally, TCP should send a delayed ACK unless:\r
   //   1. ACK at least every other FULL sized segment received,\r
@@ -1011,7 +1014,7 @@ TcpToSendAck (
   //\r
   if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_ACK_NOW) ||\r
       (Tcb->DelayedAck >= 1) ||\r
-      (TcpRcvWinNow (Tcb) > TcpRcvWinOld (Tcb))\r
+      (TcpNow > TcpRcvWinOld (Tcb))\r
       ) {\r
     TcpSendAck (Tcb);\r
     return;\r