NetworkPkg: Change use of EFI_D_* to DEBUG_*

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3739

Update all use of EFI_D_* defines in DEBUG() macros to DEBUG_* defines.

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>

9 files changed, 108 insertions, 114 deletions

diff --git a/NetworkPkg/TcpDxe/SockImpl.c b/NetworkPkg/TcpDxe/SockImpl.c
index 564e621ef9..2ab0b69140 100644
--- a/NetworkPkg/TcpDxe/SockImpl.c
+++ b/NetworkPkg/TcpDxe/SockImpl.c
@@ -381,7 +381,7 @@ SockProcessTcpSndData (
 

   if (NULL == SndData) {

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockKProcessSndData: Failed to call NetBufferFromExt\n")

       );

 

@@ -516,7 +516,7 @@ SockWakeListenToken (
 

     Parent->ConnCnt--;

     DEBUG (

-      (EFI_D_NET,

+      (DEBUG_NET,

       "SockWakeListenToken: accept a socket, now conncnt is %d",

       Parent->ConnCnt)

       );

@@ -667,7 +667,7 @@ SockCreate (
 

   if ((Parent != NULL) && (Parent->ConnCnt == Parent->BackLog)) {

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockCreate: Socket parent has reached its connection limit with %d ConnCnt and %d BackLog\n",

       Parent->ConnCnt,

       Parent->BackLog)

@@ -679,7 +679,7 @@ SockCreate (
   Sock = AllocateZeroPool (sizeof (SOCKET));

   if (NULL == Sock) {

 

-    DEBUG ((EFI_D_ERROR, "SockCreate: No resource to create a new socket\n"));

+    DEBUG ((DEBUG_ERROR, "SockCreate: No resource to create a new socket\n"));

     return NULL;

   }

 

@@ -695,7 +695,7 @@ SockCreate (
   Sock->SndBuffer.DataQueue = NetbufQueAlloc ();

   if (NULL == Sock->SndBuffer.DataQueue) {

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockCreate: No resource to allocate SndBuffer for new socket\n")

       );

 

@@ -705,7 +705,7 @@ SockCreate (
   Sock->RcvBuffer.DataQueue = NetbufQueAlloc ();

   if (NULL == Sock->RcvBuffer.DataQueue) {

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockCreate: No resource to allocate RcvBuffer for new socket\n")

       );

 

@@ -751,7 +751,7 @@ SockCreate (
 

   if (EFI_ERROR (Status)) {

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockCreate: Install TCP protocol in socket failed with %r\n",

       Status)

       );

@@ -770,7 +770,7 @@ SockCreate (
     Parent->ConnCnt++;

 

     DEBUG (

-      (EFI_D_NET,

+      (DEBUG_NET,

       "SockCreate: Create a new socket and add to parent, now conncnt is %d\n",

       Parent->ConnCnt)

       );

@@ -850,7 +850,7 @@ SockDestroy (
     (Sock->Parent->ConnCnt)--;

 

     DEBUG (

-      (EFI_D_WARN,

+      (DEBUG_WARN,

       "SockDestroy: Delete a unaccepted socket from parent now conncnt is %d\n",

       Sock->Parent->ConnCnt)

       );

@@ -975,7 +975,7 @@ SockClone (
   ClonedSock               = SockCreate (&InitData);

 

   if (NULL == ClonedSock) {

-    DEBUG ((EFI_D_ERROR, "SockClone: no resource to create a cloned sock\n"));

+    DEBUG ((DEBUG_ERROR, "SockClone: no resource to create a cloned sock\n"));

     return NULL;

   }

 

@@ -1230,4 +1230,3 @@ SockNoMoreData (
 

   }

 }

-

diff --git a/NetworkPkg/TcpDxe/SockInterface.c b/NetworkPkg/TcpDxe/SockInterface.c
index 6217eb52da..6cf31e0a0a 100644
--- a/NetworkPkg/TcpDxe/SockInterface.c
+++ b/NetworkPkg/TcpDxe/SockInterface.c
@@ -107,7 +107,7 @@ SockBufferToken (
   if (NULL == SockToken) {

 

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockBufferIOToken: No Memory to allocate SockToken\n")

       );

 

@@ -192,7 +192,7 @@ SockDestroyChild (
   if (EFI_ERROR (Status)) {

 

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockDestroyChild: Open protocol installed on socket failed with %r\n",

       Status)

       );

@@ -213,7 +213,7 @@ SockDestroyChild (
   if (EFI_ERROR (Status)) {

 

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockDestroyChild: Get the lock to access socket failed with %r\n",

       Status)

       );

@@ -229,7 +229,7 @@ SockDestroyChild (
   if (EFI_ERROR (Status)) {

 

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockDestroyChild: Protocol detach socket failed with %r\n",

       Status)

       );

@@ -280,7 +280,7 @@ SockCreateChild (
   if (NULL == Sock) {

 

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockCreateChild: No resource to create a new socket\n")

       );

 

@@ -291,7 +291,7 @@ SockCreateChild (
   if (EFI_ERROR (Status)) {

 

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockCreateChild: Get the lock to access socket failed with %r\n",

       Status)

       );

@@ -306,7 +306,7 @@ SockCreateChild (
   if (EFI_ERROR (Status)) {

 

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockCreateChild: Protocol failed to attach a socket with %r\n",

       Status)

       );

@@ -371,7 +371,7 @@ SockConfigure (
   if (EFI_ERROR (Status)) {

 

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockConfigure: Get the access for socket failed with %r",

       Status)

       );

@@ -425,7 +425,7 @@ SockConnect (
   if (EFI_ERROR (Status)) {

 

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockConnect: Get the access for socket failed with %r",

       Status)

       );

@@ -504,7 +504,7 @@ SockAccept (
   if (EFI_ERROR (Status)) {

 

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockAccept: Get the access for socket failed with %r",

       Status)

       );

@@ -557,7 +557,7 @@ SockAccept (
       Socket->Parent->ConnCnt--;

 

       DEBUG (

-        (EFI_D_NET,

+        (DEBUG_NET,

         "SockAccept: Accept a socket, now conncount is %d",

         Socket->Parent->ConnCnt)

         );

@@ -619,7 +619,7 @@ SockSend (
   if (EFI_ERROR (Status)) {

 

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockSend: Get the access for socket failed with %r",

       Status)

       );

@@ -686,7 +686,7 @@ SockSend (
 

     if (NULL == SockToken) {

       DEBUG (

-        (EFI_D_ERROR,

+        (DEBUG_ERROR,

         "SockSend: Failed to buffer IO token into socket processing SndToken List\n",

         Status)

         );

@@ -699,7 +699,7 @@ SockSend (
 

     if (EFI_ERROR (Status)) {

       DEBUG (

-        (EFI_D_ERROR,

+        (DEBUG_ERROR,

         "SockSend: Failed to process Snd Data\n",

         Status)

         );

@@ -750,7 +750,7 @@ SockRcv (
   if (EFI_ERROR (Status)) {

 

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockRcv: Get the access for socket failed with %r",

       Status)

       );

@@ -848,7 +848,7 @@ SockFlush (
   if (EFI_ERROR (Status)) {

 

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockFlush: Get the access for socket failed with %r",

       Status)

       );

@@ -866,7 +866,7 @@ SockFlush (
   if (EFI_ERROR (Status)) {

 

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockFlush: Protocol failed handling SOCK_FLUSH with %r",

       Status)

       );

@@ -919,7 +919,7 @@ SockClose (
   Status = EfiAcquireLockOrFail (&(Sock->Lock));

   if (EFI_ERROR (Status)) {

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockClose: Get the access for socket failed with %r",

       Status)

       );

@@ -990,7 +990,7 @@ SockCancel (
   Status = EfiAcquireLockOrFail (&(Sock->Lock));

   if (EFI_ERROR (Status)) {

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockCancel: Get the access for socket failed with %r",

       Status)

       );

@@ -1099,7 +1099,7 @@ SockRoute (
   Status = EfiAcquireLockOrFail (&(Sock->Lock));

   if (EFI_ERROR (Status)) {

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "SockRoute: Get the access for socket failed with %r",

       Status)

       );

@@ -1123,4 +1123,3 @@ Exit:
   EfiReleaseLock (&(Sock->Lock));

   return Status;

 }

-

diff --git a/NetworkPkg/TcpDxe/TcpDispatcher.c b/NetworkPkg/TcpDxe/TcpDispatcher.c
index 544817866f..a04646ce49 100644
--- a/NetworkPkg/TcpDxe/TcpDispatcher.c
+++ b/NetworkPkg/TcpDxe/TcpDispatcher.c
@@ -269,7 +269,7 @@ TcpBind (
       if (*RandomPort <= TCP_PORT_KNOWN) {

         if (Cycle) {

           DEBUG (

-            (EFI_D_ERROR,

+            (DEBUG_ERROR,

             "TcpBind: no port can be allocated for this pcb\n")

             );

           return EFI_OUT_OF_RESOURCES;

@@ -359,7 +359,7 @@ TcpAttachPcb (
 

   if (Tcb == NULL) {

 

-    DEBUG ((EFI_D_ERROR, "TcpConfigurePcb: failed to allocate a TCB\n"));

+    DEBUG ((DEBUG_ERROR, "TcpConfigurePcb: failed to allocate a TCB\n"));

 

     return EFI_OUT_OF_RESOURCES;

   }

@@ -540,7 +540,7 @@ TcpConfigurePcb (
 

   if (EFI_ERROR (Status)) {

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "TcpConfigurePcb: Bind endpoint failed with %r\n",

       Status)

       );

diff --git a/NetworkPkg/TcpDxe/TcpDriver.c b/NetworkPkg/TcpDxe/TcpDriver.c
index c4dcb5e193..c57725f0b5 100644
--- a/NetworkPkg/TcpDxe/TcpDriver.c
+++ b/NetworkPkg/TcpDxe/TcpDriver.c
@@ -905,7 +905,7 @@ TcpServiceBindingCreateChild (
   Sock = SockCreateChild (&mTcpDefaultSockData);

   if (NULL == Sock) {

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "TcpDriverBindingCreateChild: No resource to create a Tcp Child\n")

       );

 

diff --git a/NetworkPkg/TcpDxe/TcpInput.c b/NetworkPkg/TcpDxe/TcpInput.c
index 5e6c8c54ca..efa41d637e 100644
--- a/NetworkPkg/TcpDxe/TcpInput.c
+++ b/NetworkPkg/TcpDxe/TcpInput.c
@@ -68,7 +68,7 @@ TcpFastRecover (
     Tcb->CWnd = Tcb->Ssthresh + 3 * Tcb->SndMss;

 

     DEBUG (

-      (EFI_D_NET,

+      (DEBUG_NET,

       "TcpFastRecover: enter fast retransmission for TCB %p, recover point is %d\n",

       Tcb,

       Tcb->Recover)

@@ -91,7 +91,7 @@ TcpFastRecover (
     //

     Tcb->CWnd += Tcb->SndMss;

     DEBUG (

-      (EFI_D_NET,

+      (DEBUG_NET,

       "TcpFastRecover: received another duplicated ACK (%d) for TCB %p\n",

       Seg->Ack,

       Tcb)

@@ -115,7 +115,7 @@ TcpFastRecover (
 

       Tcb->CongestState = TCP_CONGEST_OPEN;

       DEBUG (

-        (EFI_D_NET,

+        (DEBUG_NET,

         "TcpFastRecover: received a full ACK(%d) for TCB %p, exit fast recovery\n",

         Seg->Ack,

         Tcb)

@@ -144,7 +144,7 @@ TcpFastRecover (
       Tcb->CWnd -= Acked;

 

       DEBUG (

-        (EFI_D_NET,

+        (DEBUG_NET,

         "TcpFastRecover: received a partial ACK(%d) for TCB %p\n",

         Seg->Ack,

         Tcb)

@@ -182,7 +182,7 @@ TcpFastLossRecover (
       Tcb->CongestState = TCP_CONGEST_OPEN;

 

       DEBUG (

-        (EFI_D_NET,

+        (DEBUG_NET,

         "TcpFastLossRecover: received a full ACK(%d) for TCB %p\n",

         Seg->Ack,

         Tcb)

@@ -196,7 +196,7 @@ TcpFastLossRecover (
       //

       TcpRetransmit (Tcb, Seg->Ack);

       DEBUG (

-        (EFI_D_NET,

+        (DEBUG_NET,

         "TcpFastLossRecover: received a partial ACK(%d) for TCB %p\n",

         Seg->Ack,

         Tcb)

@@ -258,7 +258,7 @@ TcpComputeRtt (
   }

 

   DEBUG (

-    (EFI_D_NET,

+    (DEBUG_NET,

     "TcpComputeRtt: new RTT for TCB %p computed SRTT: %d RTTVAR: %d RTO: %d\n",

     Tcb,

     Tcb->SRtt,

@@ -423,7 +423,7 @@ TcpDeliverData (
 

     if (TcpVerifySegment (Nbuf) == 0) {

       DEBUG (

-        (EFI_D_ERROR,

+        (DEBUG_ERROR,

         "TcpToSendData: discard a broken segment for TCB %p\n",

         Tcb)

         );

@@ -454,7 +454,7 @@ TcpDeliverData (
       //

       if (!IsListEmpty (&Tcb->RcvQue)) {

         DEBUG (

-          (EFI_D_ERROR,

+          (DEBUG_ERROR,

           "TcpDeliverData: data received after FIN from peer of TCB %p, reset connection\n",

           Tcb)

           );

@@ -464,7 +464,7 @@ TcpDeliverData (
       }

 

       DEBUG (

-        (EFI_D_NET,

+        (DEBUG_NET,

         "TcpDeliverData: processing FIN from peer of TCB %p\n",

         Tcb)

         );

@@ -498,7 +498,7 @@ TcpDeliverData (
         } else {

 

           DEBUG (

-            (EFI_D_WARN,

+            (DEBUG_WARN,

             "Connection closed immediately because app disables TIME_WAIT timer for %p\n",

             Tcb)

             );

@@ -771,7 +771,7 @@ TcpInput (
   ASSERT (Head != NULL);

 

   if (Nbuf->TotalSize < sizeof (TCP_HEAD)) {

-    DEBUG ((EFI_D_NET, "TcpInput: received a malformed packet\n"));

+    DEBUG ((DEBUG_NET, "TcpInput: received a malformed packet\n"));

     goto DISCARD;

   }

 

@@ -779,7 +779,7 @@ TcpInput (
 

   if ((Head->HeadLen < 5) || (Len < 0)) {

 

-    DEBUG ((EFI_D_NET, "TcpInput: received a malformed packet\n"));

+    DEBUG ((DEBUG_NET, "TcpInput: received a malformed packet\n"));

 

     goto DISCARD;

   }

@@ -793,7 +793,7 @@ TcpInput (
   Checksum = TcpChecksum (Nbuf, Checksum);

 

   if (Checksum != 0) {

-    DEBUG ((EFI_D_ERROR, "TcpInput: received a checksum error packet\n"));

+    DEBUG ((DEBUG_ERROR, "TcpInput: received a checksum error packet\n"));

     goto DISCARD;

   }

 

@@ -815,7 +815,7 @@ TcpInput (
           );

 

   if ((Tcb == NULL) || (Tcb->State == TCP_CLOSED)) {

-    DEBUG ((EFI_D_NET, "TcpInput: send reset because no TCB found\n"));

+    DEBUG ((DEBUG_NET, "TcpInput: send reset because no TCB found\n"));

 

     Tcb = NULL;

     goto SEND_RESET;

@@ -829,7 +829,7 @@ TcpInput (
   //

   if (TcpParseOption (Nbuf->Tcp, &Option) == -1) {

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "TcpInput: reset the peer because of malformed option for TCB %p\n",

       Tcb)

       );

@@ -852,7 +852,7 @@ TcpInput (
     //

     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {

       DEBUG (

-        (EFI_D_WARN,

+        (DEBUG_WARN,

         "TcpInput: discard a reset segment for TCB %p in listening\n",

         Tcb)

         );

@@ -866,7 +866,7 @@ TcpInput (
     //

     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {

       DEBUG (

-        (EFI_D_WARN,

+        (DEBUG_WARN,

         "TcpInput: send reset because of segment with ACK for TCB %p in listening\n",

         Tcb)

         );

@@ -886,7 +886,7 @@ TcpInput (
       Tcb     = TcpCloneTcb (Parent);

       if (Tcb == NULL) {

         DEBUG (

-          (EFI_D_ERROR,

+          (DEBUG_ERROR,

           "TcpInput: discard a segment because failed to clone a child for TCB %p\n",

           Tcb)

           );

@@ -895,7 +895,7 @@ TcpInput (
       }

 

       DEBUG (

-        (EFI_D_NET,

+        (DEBUG_NET,

         "TcpInput: create a child for TCB %p in listening\n",

         Tcb)

         );

@@ -915,7 +915,7 @@ TcpInput (
       TcpSetTimer (Tcb, TCP_TIMER_CONNECT, Tcb->ConnectTimeout);

       if (TcpTrimInWnd (Tcb, Nbuf) == 0) {

         DEBUG (

-          (EFI_D_ERROR,

+          (DEBUG_ERROR,

           "TcpInput: discard a broken segment for TCB %p\n",

           Tcb)

           );

@@ -935,7 +935,7 @@ TcpInput (
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK) && (Seg->Ack != Tcb->Iss + 1)) {

 

       DEBUG (

-        (EFI_D_WARN,

+        (DEBUG_WARN,

         "TcpInput: send reset because of wrong ACK received for TCB %p in SYN_SENT\n",

         Tcb)

         );

@@ -951,7 +951,7 @@ TcpInput (
       if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {

 

         DEBUG (

-          (EFI_D_WARN,

+          (DEBUG_WARN,

           "TcpInput: connection reset by peer for TCB %p in SYN_SENT\n",

           Tcb)

           );

@@ -961,7 +961,7 @@ TcpInput (
       } else {

 

         DEBUG (

-          (EFI_D_WARN,

+          (DEBUG_WARN,

           "TcpInput: discard a reset segment because of no ACK for TCB %p in SYN_SENT\n",

           Tcb)

           );

@@ -1005,7 +1005,7 @@ TcpInput (
 

         if (TcpTrimInWnd (Tcb, Nbuf) == 0) {

           DEBUG (

-            (EFI_D_ERROR,

+            (DEBUG_ERROR,

             "TcpInput: discard a broken segment for TCB %p\n",

             Tcb)

             );

@@ -1016,7 +1016,7 @@ TcpInput (
         TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_ACK_NOW);

 

         DEBUG (

-          (EFI_D_NET,

+          (DEBUG_NET,

           "TcpInput: connection established for TCB %p in SYN_SENT\n",

           Tcb)

           );

@@ -1032,7 +1032,7 @@ TcpInput (
 

         if (TcpAdjustSndQue (Tcb, Tcb->SndNxt) == 0 || TcpTrimInWnd (Tcb, Nbuf) == 0) {

           DEBUG (

-            (EFI_D_ERROR,

+            (DEBUG_ERROR,

             "TcpInput: discard a broken segment for TCB %p\n",

             Tcb)

             );

@@ -1041,7 +1041,7 @@ TcpInput (
         }

 

         DEBUG (

-          (EFI_D_WARN,

+          (DEBUG_WARN,

           "TcpInput: simultaneous open for TCB %p in SYN_SENT\n",

           Tcb)

           );

@@ -1070,7 +1070,7 @@ TcpInput (
   //

   if (TcpSeqAcceptable (Tcb, Seg) == 0) {

     DEBUG (

-      (EFI_D_WARN,

+      (DEBUG_WARN,

       "TcpInput: sequence acceptance test failed for segment of TCB %p\n",

       Tcb)

       );

@@ -1095,7 +1095,7 @@ TcpInput (
   //

   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {

 

-    DEBUG ((EFI_D_WARN, "TcpInput: connection reset for TCB %p\n", Tcb));

+    DEBUG ((DEBUG_WARN, "TcpInput: connection reset for TCB %p\n", Tcb));

 

     if (Tcb->State == TCP_SYN_RCVD) {

 

@@ -1126,7 +1126,7 @@ TcpInput (
   //

   if (TcpTrimInWnd (Tcb, Nbuf) == 0) {

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "TcpInput: discard a broken segment for TCB %p\n",

       Tcb)

       );

@@ -1144,7 +1144,7 @@ TcpInput (
   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_SYN)) {

 

     DEBUG (

-      (EFI_D_WARN,

+      (DEBUG_WARN,

       "TcpInput: connection reset because received extra SYN for TCB %p\n",

       Tcb)

       );

@@ -1157,7 +1157,7 @@ TcpInput (
   //

   if (!TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {

     DEBUG (

-      (EFI_D_WARN,

+      (DEBUG_WARN,

       "TcpInput: segment discard because of no ACK for connected TCB %p\n",

       Tcb)

       );

@@ -1186,7 +1186,7 @@ TcpInput (
       TcpDeliverData (Tcb);

 

       DEBUG (

-        (EFI_D_NET,

+        (DEBUG_NET,

         "TcpInput: connection established for TCB %p in SYN_RCVD\n",

         Tcb)

         );

@@ -1196,7 +1196,7 @@ TcpInput (
       //

     } else {

       DEBUG (

-        (EFI_D_WARN,

+        (DEBUG_WARN,

         "TcpInput: send reset because of wrong ACK for TCB %p in SYN_RCVD\n",

         Tcb)

         );

@@ -1208,7 +1208,7 @@ TcpInput (
   if (TCP_SEQ_LT (Seg->Ack, Tcb->SndUna)) {

 

     DEBUG (

-      (EFI_D_WARN,

+      (DEBUG_WARN,

       "TcpInput: ignore the out-of-data ACK for connected TCB %p\n",

       Tcb)

       );

@@ -1218,7 +1218,7 @@ TcpInput (
   } else if (TCP_SEQ_GT (Seg->Ack, Tcb->SndNxt)) {

 

     DEBUG (

-      (EFI_D_WARN,

+      (DEBUG_WARN,

       "TcpInput: discard segment for future ACK for connected TCB %p\n",

       Tcb)

       );

@@ -1309,7 +1309,7 @@ TcpInput (
 

     if (TcpAdjustSndQue (Tcb, Seg->Ack) == 0) {

       DEBUG (

-        (EFI_D_ERROR,

+        (DEBUG_ERROR,

         "TcpInput: discard a broken segment for TCB %p\n",

         Tcb)

         );

@@ -1347,7 +1347,7 @@ TcpInput (
       }

 

       DEBUG (

-        (EFI_D_WARN,

+        (DEBUG_WARN,

         "TcpInput: peer shrinks the window for connected TCB %p\n",

         Tcb)

         );

@@ -1375,14 +1375,14 @@ TcpInput (
         // 2^Rcv.Wind.Shift before moving the SndNxt to the left.

         //

         DEBUG (

-          (EFI_D_WARN,

+          (DEBUG_WARN,

           "TcpInput: peer advise negative useable window for connected TCB %p\n",

           Tcb)

           );

         Usable = TCP_SUB_SEQ (Tcb->SndNxt, Right);

         if ((Usable >> Tcb->SndWndScale) > 0) {

           DEBUG (

-            (EFI_D_WARN,

+            (DEBUG_WARN,

             "TcpInput: SndNxt is out of window by more than window scale for TCB %p\n",

             Tcb)

             );

@@ -1409,7 +1409,7 @@ NO_UPDATE:
   {

 

     DEBUG (

-      (EFI_D_NET,

+      (DEBUG_NET,

       "TcpInput: local FIN is ACKed by peer for connected TCB %p\n",

       Tcb)

       );

@@ -1452,7 +1452,7 @@ NO_UPDATE:
       } else {

 

         DEBUG (

-          (EFI_D_WARN,

+          (DEBUG_WARN,

           "Connection closed immediately because app disables TIME_WAIT timer for %p\n",

           Tcb)

           );

@@ -1481,7 +1481,7 @@ NO_UPDATE:
     } else {

 

       DEBUG (

-        (EFI_D_WARN,

+        (DEBUG_WARN,

         "Connection closed immediately because app disables TIME_WAIT timer for %p\n",

         Tcb)

         );

@@ -1505,7 +1505,7 @@ StepSix:
   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_URG) && !TCP_FIN_RCVD (Tcb->State)) {

 

     DEBUG (

-      (EFI_D_NET,

+      (DEBUG_NET,

       "TcpInput: received urgent data from peer for connected TCB %p\n",

       Tcb)

       );

@@ -1531,7 +1531,7 @@ StepSix:
     if (TCP_FIN_RCVD (Tcb->State)) {

 

       DEBUG (

-        (EFI_D_WARN,

+        (DEBUG_WARN,

         "TcpInput: connection reset because data is lost for connected TCB %p\n",

         Tcb)

         );

@@ -1541,7 +1541,7 @@ StepSix:
 

     if (TCP_LOCAL_CLOSED (Tcb->State) && (Nbuf->TotalSize != 0)) {

       DEBUG (

-        (EFI_D_WARN,

+        (DEBUG_WARN,

         "TcpInput: connection reset because data is lost for connected TCB %p\n",

         Tcb)

         );

@@ -1551,7 +1551,7 @@ StepSix:
 

     if (TcpQueueData (Tcb, Nbuf) == 0) {

       DEBUG (

-        (EFI_D_ERROR,

+        (DEBUG_ERROR,

         "TcpInput: discard a broken segment for TCB %p\n",

         Tcb)

         );

@@ -1615,7 +1615,7 @@ DISCARD:
   //

   // Tcb is a child of Parent, and it doesn't survive

   //

-  DEBUG ((EFI_D_WARN, "TcpInput: Discard a packet\n"));

+  DEBUG ((DEBUG_WARN, "TcpInput: Discard a packet\n"));

   NetbufFree (Nbuf);

 

   if ((Parent != NULL) && (Tcb != NULL)) {

diff --git a/NetworkPkg/TcpDxe/TcpIo.c b/NetworkPkg/TcpDxe/TcpIo.c
index c7c2977f51..5504c30cee 100644
--- a/NetworkPkg/TcpDxe/TcpIo.c
+++ b/NetworkPkg/TcpDxe/TcpIo.c
@@ -80,7 +80,7 @@ TcpSendIpPacket (
     IpSender = IpIoFindSender (&IpIo, Version, Src);

 

     if (IpSender == NULL) {

-      DEBUG ((EFI_D_WARN, "TcpSendIpPacket: No appropriate IpSender.\n"));

+      DEBUG ((DEBUG_WARN, "TcpSendIpPacket: No appropriate IpSender.\n"));

       return -1;

     }

 

@@ -130,7 +130,7 @@ TcpSendIpPacket (
   Status = IpIoSend (IpIo, Nbuf, IpSender, NULL, NULL, Dest, &Override);

 

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "TcpSendIpPacket: return %r error\n", Status));

+    DEBUG ((DEBUG_ERROR, "TcpSendIpPacket: return %r error\n", Status));

     return -1;

   }

 

@@ -171,7 +171,7 @@ Tcp6RefreshNeighbor (
     IpIoFindSender (&IpIo, IP_VERSION_6, Neighbor);

 

     if (IpIo == NULL) {

-      DEBUG ((EFI_D_WARN, "Tcp6AddNeighbor: No appropriate IpIo.\n"));

+      DEBUG ((DEBUG_WARN, "Tcp6AddNeighbor: No appropriate IpIo.\n"));

       return EFI_NOT_STARTED;

     }

 

@@ -183,4 +183,3 @@ Tcp6RefreshNeighbor (
 

   return IpIoRefreshNeighbor (IpIo, Neighbor, Timeout);

 }

-

diff --git a/NetworkPkg/TcpDxe/TcpMisc.c b/NetworkPkg/TcpDxe/TcpMisc.c
index 73ed33de85..c454efefe3 100644
--- a/NetworkPkg/TcpDxe/TcpMisc.c
+++ b/NetworkPkg/TcpDxe/TcpMisc.c
@@ -501,7 +501,7 @@ TcpCloneTcb (
 

   Clone->Sk = SockClone (Tcb->Sk);

   if (Clone->Sk == NULL) {

-    DEBUG ((EFI_D_ERROR, "TcpCloneTcb: failed to clone a sock\n"));

+    DEBUG ((DEBUG_ERROR, "TcpCloneTcb: failed to clone a sock\n"));

     FreePool (Clone);

     return NULL;

   }

@@ -608,7 +608,7 @@ TcpSetState (
   ASSERT (State < (sizeof (mTcpStateName) / sizeof (CHAR16 *)));

 

   DEBUG (

-    (EFI_D_NET,

+    (DEBUG_NET,

     "Tcb (%p) state %s --> %s\n",

     Tcb,

     mTcpStateName[Tcb->State],

@@ -757,7 +757,7 @@ TcpOnAppClose (
   if (!IsListEmpty (&Tcb->RcvQue) || GET_RCV_DATASIZE (Tcb->Sk) != 0) {

 

     DEBUG (

-      (EFI_D_WARN,

+      (DEBUG_WARN,

       "TcpOnAppClose: connection reset because data is lost for TCB %p\n",

       Tcb)

       );

@@ -857,7 +857,7 @@ TcpOnAppConsume (
       if (TcpOld < Tcb->RcvMss) {

 

         DEBUG (

-          (EFI_D_NET,

+          (DEBUG_NET,

           "TcpOnAppConsume: send a window update for a window closed Tcb %p\n",

           Tcb)

           );

@@ -866,7 +866,7 @@ TcpOnAppConsume (
       } else if (Tcb->DelayedAck == 0) {

 

         DEBUG (

-          (EFI_D_NET,

+          (DEBUG_NET,

           "TcpOnAppConsume: scheduled a delayed ACK to update window for Tcb %p\n",

           Tcb)

           );

@@ -895,7 +895,7 @@ TcpOnAppAbort (
   )

 {

   DEBUG (

-    (EFI_D_WARN,

+    (DEBUG_WARN,

     "TcpOnAppAbort: connection reset issued by application for TCB %p\n",

     Tcb)

     );

@@ -1039,4 +1039,3 @@ TcpInstallDevicePath (
 

   return Status;

 }

-

diff --git a/NetworkPkg/TcpDxe/TcpOutput.c b/NetworkPkg/TcpDxe/TcpOutput.c
index 7d0cf0900a..50ea9460ad 100644
--- a/NetworkPkg/TcpDxe/TcpOutput.c
+++ b/NetworkPkg/TcpDxe/TcpOutput.c
@@ -250,7 +250,7 @@ SetPersistTimer:
   if (!TCP_TIMER_ON (Tcb->EnabledTimer, TCP_TIMER_REXMIT)) {

 

     DEBUG (

-      (EFI_D_WARN,

+      (DEBUG_WARN,

       "TcpDataToSend: enter persistent state for TCB %p\n",

       Tcb)

       );

@@ -562,7 +562,7 @@ TcpGetSegmentSock (
 

   if (Nbuf == NULL) {

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "TcpGetSegmentSock: failed to allocate a netbuf for TCB %p\n",

       Tcb)

       );

@@ -678,7 +678,7 @@ TcpRetransmit (
       (TCP_SEQ_GT (Seq, Tcb->RetxmitSeqMax) || TCP_SEQ_BETWEEN (Tcb->SndWl2 + Tcb->SndWnd, Seq, Tcb->SndWl2 + Tcb->SndWnd + (1 << Tcb->SndWndScale)))) {

     Len = TCP_SUB_SEQ (Tcb->SndNxt, Seq);

     DEBUG (

-      (EFI_D_WARN,

+      (DEBUG_WARN,

       "TcpRetransmit: retransmission without regard to the receiver window for TCB %p\n",

       Tcb)

       );

@@ -688,7 +688,7 @@ TcpRetransmit (
 

   } else {

     DEBUG (

-      (EFI_D_WARN,

+      (DEBUG_WARN,

       "TcpRetransmit: retransmission cancelled because send window too small for TCB %p\n",

       Tcb)

       );

@@ -845,7 +845,7 @@ TcpToSendData (
 

     if (Nbuf == NULL) {

       DEBUG (

-        (EFI_D_ERROR,

+        (DEBUG_ERROR,

         "TcpToSendData: failed to get a segment for TCB %p\n",

         Tcb)

         );

@@ -874,7 +874,7 @@ TcpToSendData (
           TCP_SEQ_LT (End + 1, Tcb->SndWnd + Tcb->SndWl2)

             ) {

         DEBUG (

-          (EFI_D_NET,

+          (DEBUG_NET,

           "TcpToSendData: send FIN to peer for TCB %p in state %s\n",

           Tcb,

           mTcpStateName[Tcb->State])

@@ -892,7 +892,7 @@ TcpToSendData (
 

     if (TcpVerifySegment (Nbuf) == 0 || TcpCheckSndQue (&Tcb->SndQue) == 0) {

       DEBUG (

-        (EFI_D_ERROR,

+        (DEBUG_ERROR,

         "TcpToSendData: discard a broken segment for TCB %p\n",

         Tcb)

         );

@@ -904,7 +904,7 @@ TcpToSendData (
     //

     if (Seg->End == Seg->Seq) {

       DEBUG (

-        (EFI_D_WARN,

+        (DEBUG_WARN,

         "TcpToSendData: created a empty segment for TCB %p, free it now\n",

         Tcb)

         );

@@ -959,7 +959,7 @@ TcpToSendData (
     if ((Tcb->CongestState == TCP_CONGEST_OPEN) && !TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RTT_ON)) {

 

       DEBUG (

-        (EFI_D_NET,

+        (DEBUG_NET,

         "TcpToSendData: set RTT measure sequence %d for TCB %p\n",

         Seq,

         Tcb)

@@ -1090,7 +1090,7 @@ TcpToSendAck (
   }

 

   DEBUG (

-    (EFI_D_NET,

+    (DEBUG_NET,

     "TcpToSendAck: scheduled a delayed ACK for TCB %p\n",

     Tcb)

     );

@@ -1248,4 +1248,3 @@ TcpVerifySegment (
 

   return 1;

 }

-

diff --git a/NetworkPkg/TcpDxe/TcpTimer.c b/NetworkPkg/TcpDxe/TcpTimer.c
index 106d9470db..04caf8e509 100644
--- a/NetworkPkg/TcpDxe/TcpTimer.c
+++ b/NetworkPkg/TcpDxe/TcpTimer.c
@@ -148,7 +148,7 @@ TcpConnectTimeout (
 {

   if (!TCP_CONNECTED (Tcb->State)) {

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "TcpConnectTimeout: connection closed because connection timer timeout for TCB %p\n",

       Tcb)

       );

@@ -159,7 +159,7 @@ TcpConnectTimeout (
 

     if (TCP_SYN_RCVD == Tcb->State) {

       DEBUG (

-        (EFI_D_WARN,

+        (DEBUG_WARN,

         "TcpConnectTimeout: send reset because connection timer timeout for TCB %p\n",

         Tcb)

         );

@@ -187,7 +187,7 @@ TcpRexmitTimeout (
   UINT32  FlightSize;

 

   DEBUG (

-    (EFI_D_WARN,

+    (DEBUG_WARN,

     "TcpRexmitTimeout: transmission timeout for TCB %p\n",

     Tcb)

     );

@@ -207,7 +207,7 @@ TcpRexmitTimeout (
   if ((Tcb->LossTimes > Tcb->MaxRexmit) && !TCP_TIMER_ON (Tcb->EnabledTimer, TCP_TIMER_CONNECT)) {

 

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "TcpRexmitTimeout: connection closed because too many timeouts for TCB %p\n",

       Tcb)

       );

@@ -299,7 +299,7 @@ TcpFinwait2Timeout (
   )

 {

   DEBUG (

-    (EFI_D_WARN,

+    (DEBUG_WARN,

     "TcpFinwait2Timeout: connection closed because FIN_WAIT2 timer timeouts for TCB %p\n",

     Tcb)

     );

@@ -319,7 +319,7 @@ Tcp2MSLTimeout (
   )

 {

   DEBUG (

-    (EFI_D_WARN,

+    (DEBUG_WARN,

     "Tcp2MSLTimeout: connection closed because TIME_WAIT timer timeouts for TCB %p\n",

     Tcb)

     );

@@ -584,4 +584,3 @@ TcpTicking (
 {

   QueueDpc (TPL_CALLBACK, TcpTickingDpc, Context);

 }

-