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
IN TCP_CB *Tcb\r
)\r
{\r
- NET_LIST_ENTRY *Entry;\r
+ LIST_ENTRY *Entry;\r
NET_BUF *Nbuf;\r
\r
- if (NetListIsEmpty (&Tcb->SndQue)) {\r
+ if (IsListEmpty (&Tcb->SndQue)) {\r
return Tcb->SndNxt;\r
}\r
\r
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
SetPersistTimer:\r
if (!TCP_TIMER_ON (Tcb->EnabledTimer, TCP_TIMER_REXMIT)) {\r
\r
- TCP4_DEBUG_WARN (\r
- ("TcpDataToSend: enter persistent state for TCB %x\n",\r
+ DEBUG (\r
+ (EFI_D_WARN,\r
+ "TcpDataToSend: enter persistent state for TCB %x\n",\r
Tcb)\r
);\r
\r
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
IN UINT32 Len\r
)\r
{\r
- NET_LIST_ENTRY *Head;\r
- NET_LIST_ENTRY *Cur;\r
+ LIST_ENTRY *Head;\r
+ LIST_ENTRY *Cur;\r
NET_BUF *Node;\r
TCP_SEG *Seg;\r
NET_BUF *Nbuf;\r
}\r
}\r
\r
- NetCopyMem (TCPSEG_NETBUF (Nbuf), Seg, sizeof (TCP_SEG));\r
+ CopyMem (TCPSEG_NETBUF (Nbuf), Seg, sizeof (TCP_SEG));\r
\r
TCPSEG_NETBUF (Nbuf)->Seq = Seq;\r
TCPSEG_NETBUF (Nbuf)->End = End;\r
Nbuf = NetbufAlloc (Len + TCP_MAX_HEAD);\r
\r
if (Nbuf == NULL) {\r
- TCP4_DEBUG_ERROR (("TcpGetSegmentSock: failed to allocate "\r
+ DEBUG ((EFI_D_ERROR, "TcpGetSegmentSock: failed to allocate "\r
"a netbuf for TCB %x\n",Tcb));\r
\r
return NULL;\r
TCPSEG_NETBUF (Nbuf)->Seq = Seq;\r
TCPSEG_NETBUF (Nbuf)->End = Seq + Len;\r
\r
- NetListInsertTail (&(Tcb->SndQue), &(Nbuf->List));\r
+ InsertTailList (&(Tcb->SndQue), &(Nbuf->List));\r
\r
if (DataGet != 0) {\r
\r
// 3. will not change the boundaries of queued segments.\r
//\r
if (TCP_SEQ_LT (Tcb->SndWl2 + Tcb->SndWnd, Seq)) {\r
- TCP4_DEBUG_WARN (("TcpRetransmit: retransmission cancelled "\r
+ DEBUG ((EFI_D_WARN, "TcpRetransmit: retransmission cancelled "\r
"because send window too small for TCB %x\n", Tcb));\r
\r
return 0;\r
}\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
Nbuf = TcpGetSegment (Tcb, Seq, Len);\r
\r
if (Nbuf == NULL) {\r
- TCP4_DEBUG_ERROR (\r
- ("TcpToSendData: failed to get a segment for TCB %x\n",\r
+ DEBUG (\r
+ (EFI_D_ERROR,\r
+ "TcpToSendData: failed to get a segment for TCB %x\n",\r
Tcb)\r
);\r
\r
TCP_SEQ_LT (End + 1, Tcb->SndWnd + Tcb->SndWl2)\r
) {\r
\r
- TCP4_DEBUG_TRACE (("TcpToSendData: send FIN "\r
+ DEBUG ((EFI_D_INFO, "TcpToSendData: send FIN "\r
"to peer for TCB %x in state %d\n", Tcb, Tcb->State));\r
\r
End++;\r
// don't send an empty segment here.\r
//\r
if (Seg->End == Seg->Seq) {\r
- TCP4_DEBUG_WARN (("TcpToSendData: created a empty"\r
+ DEBUG ((EFI_D_WARN, "TcpToSendData: created a empty"\r
" segment for TCB %x, free it now\n", Tcb));\r
\r
NetbufFree (Nbuf);\r
if ((Tcb->CongestState == TCP_CONGEST_OPEN) &&\r
!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RTT_ON)) {\r
\r
- TCP4_DEBUG_TRACE (("TcpToSendData: set RTT measure "\r
+ DEBUG ((EFI_D_INFO, "TcpToSendData: set RTT measure "\r
"sequence %d for TCB %x\n", Seq, Tcb));\r
\r
TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_RTT_ON);\r
return;\r
}\r
\r
- TCP4_DEBUG_TRACE (("TcpToSendAck: scheduled a delayed"\r
+ DEBUG ((EFI_D_INFO, "TcpToSendAck: scheduled a delayed"\r
" ACK for TCB %x\n", Tcb));\r
\r
//\r
**/\r
INTN\r
TcpCheckSndQue (\r
- IN NET_LIST_ENTRY *Head\r
+ IN LIST_ENTRY *Head\r
)\r
{\r
- NET_LIST_ENTRY *Entry;\r
+ LIST_ENTRY *Entry;\r
NET_BUF *Nbuf;\r
TCP_SEQNO Seq;\r
\r
- if (NetListIsEmpty (Head)) {\r
+ if (IsListEmpty (Head)) {\r
return 1;\r
}\r
//\r