X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FNetwork%2FTcp4Dxe%2FTcp4Input.c;h=f8dcc365e30c4987fe7635d89a1ff7efb48b394f;hb=ac8cca2a4dd777970811fb727c396e2585c2bba1;hp=b29e6cb67202abfc70955bdcb93fbdd89f4c82c1;hpb=b45b45b2d248892930620c33a9d01d8457ae0e54;p=mirror_edk2.git

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
index b29e6cb672..f8dcc365e3 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
@@ -1,8 +1,8 @@
 /** @file
   TCP input process routines.
 
-Copyright (c) 2005 - 2009, Intel Corporation<BR>
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php<BR>
@@ -33,7 +33,7 @@ TcpSeqAcceptable (
   )
 {
   return (TCP_SEQ_LEQ (Tcb->RcvWl2, Seg->End) &&
-          TCP_SEQ_LEQ (Seg->Seq, Tcb->RcvWl2 + Tcb->RcvWnd));
+          TCP_SEQ_LT (Seg->Seq, Tcb->RcvWl2 + Tcb->RcvWnd));
 }
 
 
@@ -799,7 +799,7 @@ TcpInput (
       Tcb     = TcpCloneTcb (Parent);
       if (Tcb == NULL) {
         DEBUG ((EFI_D_ERROR, "TcpInput: discard a segment because"
-          "failed to clone a child for TCB%x\n", Tcb));
+          " failed to clone a child for TCB%x\n", Tcb));
 
         goto DISCARD;
       }
@@ -925,6 +925,14 @@ TcpInput (
   // Process segment in SYN_RCVD or TCP_CONNECTED states
   //
 
+  //
+  // Clear probe timer since the RecvWindow is opened.
+  //
+  if (Tcb->ProbeTimerOn && (Seg->Wnd != 0)) {
+    TcpClearTimer (Tcb, TCP_TIMER_PROBE);
+    Tcb->ProbeTimerOn = FALSE;
+  }
+
   //
   // First step: Check whether SEG.SEQ is acceptable
   //
@@ -1281,11 +1289,6 @@ StepSix:
   Tcb->Idle = 0;
   TcpSetKeepaliveTimer (Tcb);
 
-  if (TCP_TIMER_ON (Tcb->EnabledTimer, TCP_TIMER_PROBE)) {
-
-    TcpClearTimer (Tcb, TCP_TIMER_PROBE);
-  }
-
   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_URG) &&
       !TCP_FIN_RCVD (Tcb->State)) {