Update network drivers to use FreePool() instead of gBS->FreePool().

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9424 6f19259b-4bc3-4df7-8a09-765794883524

7 files changed, 36 insertions, 36 deletions

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.c
index 1e01ef7bb0..bd66f63527 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.c
@@ -1,6 +1,6 @@
 /** @file

 

-Copyright (c) 2005 - 2006, Intel Corporation.<BR>

+Copyright (c) 2005 - 2009, Intel Corporation.<BR>

 All rights reserved. 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

@@ -370,7 +370,7 @@ Ip4SetVariableData (
              );

     }

 

-    gBS->FreePool (IpSb->MacString);

+    FreePool (IpSb->MacString);

   }

 

   IpSb->MacString = NewMacString;

@@ -385,7 +385,7 @@ Ip4SetVariableData (
 

 ON_ERROR:

 

-  gBS->FreePool (Ip4VariableData);

+  FreePool (Ip4VariableData);

 

   return Status;

 }

@@ -412,6 +412,6 @@ Ip4ClearVariableData (
          NULL

          );

 

-  gBS->FreePool (IpSb->MacString);

+  FreePool (IpSb->MacString);

   IpSb->MacString = NULL;

 }

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
index 79c5bae0f3..1b7fa4e603 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
@@ -298,7 +298,7 @@ Ip4CreateService (
 

 ON_ERROR:

   Ip4CleanService (IpSb);

-  gBS->FreePool (IpSb);

+  FreePool (IpSb);

 

   return Status;

 }

@@ -488,7 +488,7 @@ UNINSTALL_PROTOCOL:
 

 FREE_SERVICE:

   Ip4CleanService (IpSb);

-  gBS->FreePool (IpSb);

+  FreePool (IpSb);

 

   return Status;

 }

@@ -686,7 +686,7 @@ Ip4DriverBindingStop (
            ServiceBinding

            );

 

-    gBS->FreePool (IpSb);

+    FreePool (IpSb);

   } else if (NumberOfChildren == 0) {

     IpSb->InDestory = TRUE;

 

@@ -714,7 +714,7 @@ Ip4DriverBindingStop (
            ServiceBinding

            );

 

-    gBS->FreePool (IpSb);

+    FreePool (IpSb);

   } else {

 

     while (!IsListEmpty (&IpSb->Children)) {

@@ -834,7 +834,7 @@ ON_ERROR:
 

     Ip4CleanProtocol (IpInstance);

 

-    gBS->FreePool (IpInstance);

+    FreePool (IpInstance);

   }

 

   return Status;

@@ -971,7 +971,7 @@ Ip4ServiceBindingDestroyChild (
 

   gBS->RestoreTPL (OldTpl);

 

-  gBS->FreePool (IpInstance);

+  FreePool (IpInstance);

   return EFI_SUCCESS;

 

 ON_ERROR:

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
index 24727b0516..3c575d58e6 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
@@ -188,7 +188,7 @@ Ip4WrapLinkTxToken (
                   );

 

   if (EFI_ERROR (Status)) {

-    gBS->FreePool (Token);

+    FreePool (Token);

     return NULL;

   }

 

@@ -225,7 +225,7 @@ Ip4FreeLinkTxToken (
   NET_CHECK_SIGNATURE (Token, IP4_FRAME_TX_SIGNATURE);

 

   gBS->CloseEvent (Token->MnpToken.Event);

-  gBS->FreePool (Token);

+  FreePool (Token);

 }

 

 

@@ -269,7 +269,7 @@ Ip4CreateArpQue (
                   );

 

   if (EFI_ERROR (Status)) {

-    gBS->FreePool (ArpQue);

+    FreePool (ArpQue);

     return NULL;

   }

 

@@ -302,7 +302,7 @@ Ip4FreeArpQue (
   Ip4CancelFrameArp (ArpQue, IoStatus, NULL, NULL);

 

   gBS->CloseEvent (ArpQue->OnResolved);

-  gBS->FreePool (ArpQue);

+  FreePool (ArpQue);

 }

 

 

@@ -353,7 +353,7 @@ Ip4CreateLinkRxToken (
                   );

 

   if (EFI_ERROR (Status)) {

-    gBS->FreePool (Token);

+    FreePool (Token);

     return NULL;

   }

 

@@ -378,7 +378,7 @@ Ip4FreeFrameRxToken (
   NET_CHECK_SIGNATURE (Token, IP4_FRAME_RX_SIGNATURE);

 

   gBS->CloseEvent (Token->MnpToken.Event);

-  gBS->FreePool (Token);

+  FreePool (Token);

 }

 

 

@@ -523,7 +523,7 @@ Ip4CreateInterface (
   // Get the interface's Mac address and broadcast mac address from SNP

   //

   if (EFI_ERROR (Mnp->GetModeData (Mnp, NULL, &SnpMode))) {

-    gBS->FreePool (Interface);

+    FreePool (Interface);

     return NULL;

   }

 

@@ -774,7 +774,7 @@ Ip4FreeInterface (
   }

 

   RemoveEntryList (&Interface->Link);

-  gBS->FreePool (Interface);

+  FreePool (Interface);

 

   return EFI_SUCCESS;

 }

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c
index 7b56a6664c..849a40d413 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c
@@ -76,7 +76,7 @@ Ip4InitIgmp (
   return EFI_SUCCESS;

 

 ON_ERROR:

-  gBS->FreePool (Group);

+  FreePool (Group);

   return Status;

 }

 

@@ -325,7 +325,7 @@ Ip4JoinGroup (
   return EFI_SUCCESS;

 

 ON_ERROR:

-  gBS->FreePool (Group);

+  FreePool (Group);

   return Status;

 }

 

@@ -394,7 +394,7 @@ Ip4LeaveGroup (
   }

 

   RemoveEntryList (&Group->Link);

-  gBS->FreePool (Group);

+  FreePool (Group);

 

   return EFI_SUCCESS;

 }

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
index bb5b0ef110..0b570e2594 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
@@ -682,7 +682,7 @@ Ip4AutoConfigCallBackDpc (
   Ip4SetVariableData (IpSb);

 

 ON_EXIT:

-  gBS->FreePool (Data);

+  FreePool (Data);

 }

 

 /**

@@ -1045,13 +1045,13 @@ Ip4CleanProtocol (
   }

 

   if (IpInstance->EfiRouteTable != NULL) {

-    gBS->FreePool (IpInstance->EfiRouteTable);

+    FreePool (IpInstance->EfiRouteTable);

     IpInstance->EfiRouteTable = NULL;

     IpInstance->EfiRouteCount = 0;

   }

 

   if (IpInstance->Groups != NULL) {

-    gBS->FreePool (IpInstance->Groups);

+    FreePool (IpInstance->Groups);

     IpInstance->Groups      = NULL;

     IpInstance->GroupCount  = 0;

   }

@@ -1337,12 +1337,12 @@ Ip4Groups (
     }

 

     if (EFI_ERROR (Ip4JoinGroup (IpInstance, NTOHL (Group)))) {

-      gBS->FreePool (Members);

+      FreePool (Members);

       return EFI_DEVICE_ERROR;

     }

 

     if (IpInstance->Groups != NULL) {

-      gBS->FreePool (IpInstance->Groups);

+      FreePool (IpInstance->Groups);

     }

 

     IpInstance->Groups = Members;

@@ -1370,7 +1370,7 @@ Ip4Groups (
       if (IpInstance->GroupCount == 0) {

         ASSERT (Index == 1);

 

-        gBS->FreePool (IpInstance->Groups);

+        FreePool (IpInstance->Groups);

         IpInstance->Groups = NULL;

       }

 

@@ -1794,7 +1794,7 @@ Ip4FreeTxToken (
     DispatchDpc ();

   }

 

-  gBS->FreePool (Wrap);

+  FreePool (Wrap);

 }

 

 

@@ -1992,7 +1992,7 @@ EfiIp4Transmit (
                         );

 

   if (Wrap->Packet == NULL) {

-    gBS->FreePool (Wrap);

+    FreePool (Wrap);

     goto ON_EXIT;

   }

 

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
index 779dd496a5..03297aa26c 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
@@ -85,7 +85,7 @@ Ip4FreeAssembleEntry (
     NetbufFree (Fragment);

   }

 

-  gBS->FreePool (Assemble);

+  FreePool (Assemble);

 }

 

 

@@ -1024,7 +1024,7 @@ Ip4OnRecyclePacket (
   NetbufFree (Wrap->Packet);

 

   gBS->CloseEvent (Wrap->RxData.RecycleSignal);

-  gBS->FreePool (Wrap);

+  FreePool (Wrap);

 }

 

 

@@ -1076,7 +1076,7 @@ Ip4WrapRxData (
                   );

 

   if (EFI_ERROR (Status)) {

-    gBS->FreePool (Wrap);

+    FreePool (Wrap);

     return NULL;

   }

 

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.c
index 0c901e8266..cdf8538dcd 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.c
@@ -67,7 +67,7 @@ Ip4FreeRouteEntry (
   ASSERT (RtEntry->RefCnt > 0);

 

   if (--RtEntry->RefCnt == 0) {

-    gBS->FreePool (RtEntry);

+    FreePool (RtEntry);

   }

 }

 

@@ -127,7 +127,7 @@ Ip4FreeRouteCacheEntry (
   ASSERT (RtCacheEntry->RefCnt > 0);

 

   if (--RtCacheEntry->RefCnt == 0) {

-    gBS->FreePool (RtCacheEntry);

+    FreePool (RtCacheEntry);

   }

 }

 

@@ -252,7 +252,7 @@ Ip4FreeRouteTable (
 

   Ip4CleanRouteCache (&RtTable->Cache);

 

-  gBS->FreePool (RtTable);

+  FreePool (RtTable);

 }

 

 

@@ -611,7 +611,7 @@ Ip4BuildEfiRouteTable (
   RtTable = IpInstance->RouteTable;

 

   if (IpInstance->EfiRouteTable != NULL) {

-    gBS->FreePool (IpInstance->EfiRouteTable);

+    FreePool (IpInstance->EfiRouteTable);

 

     IpInstance->EfiRouteTable = NULL;

     IpInstance->EfiRouteCount = 0;