Clean up Network Components to support GCC build.

[mirror_edk2.git] / MdeModulePkg / Universal / Network / MnpDxe / MnpIo.c

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
index cde235912f1b34117ba8a7422da25519cc703270..3d26ec2a4c8f763c7ec64281c02ffcf1f32ebfce 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
@@ -43,7 +43,6 @@ MnpIsValidTxToken (
   )\r
 {\r
   MNP_SERVICE_DATA                  *MnpServiceData;\r
-  EFI_SIMPLE_NETWORK_MODE           *SnpMode;\r
   EFI_MANAGED_NETWORK_TRANSMIT_DATA *TxData;\r
   UINT32                            Index;\r
   UINT32                            TotalLength;\r
@@ -52,7 +51,6 @@ MnpIsValidTxToken (
   MnpServiceData = Instance->MnpServiceData;\r
   NET_CHECK_SIGNATURE (MnpServiceData, MNP_SERVICE_DATA_SIGNATURE);\r
 \r
-  SnpMode = MnpServiceData->Snp->Mode;\r
   TxData  = Token->Packet.TxData;\r
 \r
   if ((Token->Event == NULL) || (TxData == NULL) || (TxData->FragmentCount == 0)) {\r
@@ -262,7 +260,7 @@ MnpSyncSendPacket (
       //\r
       // Get the recycled transmit buffer status.\r
       //\r
-      Snp->GetStatus (Snp, NULL, &TxBuf);\r
+      Snp->GetStatus (Snp, NULL, (VOID **) &TxBuf);\r
 \r
       if (!EFI_ERROR (gBS->CheckEvent (MnpServiceData->TxTimeoutEvent))) {\r
 \r
@@ -749,7 +747,7 @@ MnpWrapRxData (
   //\r
   // Fill the RxData in RxDataWrap,\r
   //\r
-  RxDataWrap->RxData = *RxData;\r
+  CopyMem (&RxDataWrap->RxData, RxData, sizeof (RxDataWrap->RxData));\r
 \r
   //\r
   // Create the recycle event.\r
@@ -797,6 +795,8 @@ MnpEnqueuePacket (
   MNP_GROUP_ADDRESS                 *GroupAddress;\r
   MNP_RXDATA_WRAP                   *RxDataWrap;\r
 \r
+\r
+  GroupAddress = NULL;\r
   //\r
   // First, analyse the packet header.\r
   //\r
@@ -976,7 +976,10 @@ MnpReceivePacket (
     //\r
     // No receiver for this packet.\r
     //\r
-    NetbufAllocSpace (Nbuf, Trimmed, NET_BUF_TAIL);\r
+    if (Trimmed > 0) {\r
+      NetbufAllocSpace (Nbuf, Trimmed, NET_BUF_TAIL);\r
+    }\r
+\r
     goto EXIT;\r
   }\r
   //\r