From 766c7483c335931b190a78d78d62e5a5e69dc8b9 Mon Sep 17 00:00:00 2001
From: xdu2 <xdu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 13 Nov 2009 06:13:59 +0000
Subject: [PATCH] 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
---
 .../Universal/Network/ArpDxe/ArpDriver.c      | 12 ++++-----
 .../Universal/Network/ArpDxe/ArpImpl.c        | 26 +++++++++----------
 .../Universal/Network/ArpDxe/ArpMain.c        |  4 +--
 .../Universal/Network/Dhcp4Dxe/Dhcp4Io.c      | 24 ++++++++---------
 .../Universal/Network/IScsiDxe/IScsiCHAP.c    |  8 +++---
 .../Universal/Network/IScsiDxe/IScsiConfig.c  | 14 +++++-----
 .../Universal/Network/IScsiDxe/IScsiDhcp.c    | 12 ++++-----
 .../Universal/Network/IScsiDxe/IScsiDriver.c  |  4 +--
 .../Universal/Network/IScsiDxe/IScsiMisc.c    |  8 +++---
 .../Universal/Network/IScsiDxe/IScsiProto.c   | 26 +++++++++----------
 .../Universal/Network/IScsiDxe/IScsiTcp4Io.c  |  6 ++---
 .../Network/Ip4ConfigDxe/Ip4Config.c          | 18 ++++++-------
 .../Network/Ip4ConfigDxe/Ip4ConfigDriver.c    | 10 +++----
 .../Network/Ip4ConfigDxe/Ip4ConfigNv.c        |  2 +-
 .../Network/Ip4ConfigDxe/NicIp4Variable.c     |  4 +--
 .../Universal/Network/Ip4Dxe/Ip4Common.c      |  8 +++---
 .../Universal/Network/Ip4Dxe/Ip4Driver.c      | 12 ++++-----
 MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c | 16 ++++++------
 .../Universal/Network/Ip4Dxe/Ip4Igmp.c        |  6 ++---
 .../Universal/Network/Ip4Dxe/Ip4Impl.c        | 16 ++++++------
 .../Universal/Network/Ip4Dxe/Ip4Input.c       |  6 ++---
 .../Universal/Network/Ip4Dxe/Ip4Route.c       |  8 +++---
 .../Universal/Network/MnpDxe/MnpConfig.c      | 10 +++----
 .../Universal/Network/MnpDxe/MnpDriver.c      | 10 +++----
 MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c |  4 +--
 .../Network/Mtftp4Dxe/Mtftp4Driver.c          | 16 ++++++------
 .../Universal/Network/Mtftp4Dxe/Mtftp4Impl.c  |  2 +-
 .../Network/Mtftp4Dxe/Mtftp4Option.c          |  4 +--
 .../Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c   |  2 +-
 .../Network/Mtftp4Dxe/Mtftp4Support.c         |  4 +--
 .../Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c   |  6 ++---
 .../Universal/Network/Tcp4Dxe/SockImpl.c      | 16 ++++++------
 .../Universal/Network/Tcp4Dxe/SockInterface.c |  2 +-
 .../Network/Tcp4Dxe/Tcp4Dispatcher.c          |  6 ++---
 .../Universal/Network/Tcp4Dxe/Tcp4Driver.c    |  4 +--
 .../Universal/Network/Tcp4Dxe/Tcp4Misc.c      | 10 +++----
 .../Universal/Network/Udp4Dxe/Udp4Driver.c    | 12 ++++-----
 .../Universal/Network/Udp4Dxe/Udp4Impl.c      | 10 +++----
 .../Network/UefiPxeBcDxe/PxeBcDhcp.c          |  6 ++---
 .../Network/UefiPxeBcDxe/PxeBcDriver.c        |  4 +--
 .../Network/UefiPxeBcDxe/PxeBcImpl.c          |  2 +-
 .../Network/UefiPxeBcDxe/PxeBcMtftp.c         |  4 +--
 42 files changed, 192 insertions(+), 192 deletions(-)

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c
index 63c7639ada..d2e7a59ca6 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c
@@ -1,7 +1,7 @@
 /** @file
   ARP driver functions.
   
-Copyright (c) 2006 - 2008, Intel Corporation.<BR>
+Copyright (c) 2006 - 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<BR>
@@ -401,7 +401,7 @@ ERROR:
   // On error, clean the arp service context data, and free the memory allocated.
   //
   ArpCleanService (ArpService);
-  gBS->FreePool (ArpService);
+  FreePool (ArpService);
 
   return Status;
 }
@@ -493,7 +493,7 @@ ArpDriverBindingStop (
     //
     ArpCleanService (ArpService);
 
-    gBS->FreePool (ArpService);
+    FreePool (ArpService);
   } else {
 
     while (!IsListEmpty (&ArpService->ChildrenList)) {
@@ -576,7 +576,7 @@ ArpServiceBindingCreateChild (
   if (EFI_ERROR (Status)) {
     DEBUG ((EFI_D_ERROR, "ArpSBCreateChild: faild to install ARP protocol, %r.\n", Status));
 
-    gBS->FreePool (Instance);
+    FreePool (Instance);
     return Status;
   }
 
@@ -631,7 +631,7 @@ ERROR:
     //
     // Free the allocated memory.
     //
-    gBS->FreePool (Instance);
+    FreePool (Instance);
   }
 
   return Status;
@@ -751,7 +751,7 @@ ArpServiceBindingDestroyChild (
 
   gBS->RestoreTPL (OldTpl);
 
-  gBS->FreePool (Instance);
+  FreePool (Instance);
 
   return Status;
 }
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
index 05884cab82..4841e2b2b0 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
@@ -360,10 +360,10 @@ ArpOnFrameSentDpc (
   //
   // Free the allocated memory and close the event.
   //
-  gBS->FreePool (TxData->FragmentTable[0].FragmentBuffer);
-  gBS->FreePool (TxData);
+  FreePool (TxData->FragmentTable[0].FragmentBuffer);
+  FreePool (TxData);
   gBS->CloseEvent (TxToken->Event);
-  gBS->FreePool (TxToken);
+  FreePool (TxToken);
 }
 
 /**
@@ -437,7 +437,7 @@ ArpTimerHandler (
         ASSERT (IsListEmpty (&CacheEntry->UserRequestList));
 
         RemoveEntryList (&CacheEntry->List);
-        gBS->FreePool (CacheEntry);
+        FreePool (CacheEntry);
       } else {
         //
         // resend the ARP request.
@@ -479,7 +479,7 @@ ArpTimerHandler (
       // Time out, remove it.
       //
       RemoveEntryList (&CacheEntry->List);
-      gBS->FreePool (CacheEntry);
+      FreePool (CacheEntry);
     } else {
       //
       // Update the DecayTime.
@@ -507,7 +507,7 @@ ArpTimerHandler (
       // Time out, remove it.
       //
       RemoveEntryList (&CacheEntry->List);
-      gBS->FreePool (CacheEntry);
+      FreePool (CacheEntry);
     } else {
       //
       // Update the DecayTime.
@@ -803,7 +803,7 @@ ArpAddressResolved (
       // Remove this user request and free the context data.
       //
       RemoveEntryList (&Context->List);
-      gBS->FreePool (Context);
+      FreePool (Context);
 
       Count++;
     }
@@ -988,7 +988,7 @@ ArpConfigureInstance (
       //
       // Free the buffer previously allocated to hold the station address.
       //
-      gBS->FreePool (OldConfigData->StationAddress);
+      FreePool (OldConfigData->StationAddress);
     }
 
     Instance->Configured = FALSE;
@@ -1189,18 +1189,18 @@ ArpSendFrame (
 CLEAN_EXIT:
 
   if (Packet != NULL) {
-    gBS->FreePool (Packet);
+    FreePool (Packet);
   }
 
   if (TxData != NULL) {
-    gBS->FreePool (TxData);
+    FreePool (TxData);
   }
 
   if (TxToken->Event != NULL) {
     gBS->CloseEvent (TxToken->Event);
   }
 
-  gBS->FreePool (TxToken);
+  FreePool (TxToken);
 }
 
 
@@ -1286,7 +1286,7 @@ MATCHED:
     //
     RemoveEntryList (&CacheEntry->List);
     ASSERT (IsListEmpty (&CacheEntry->UserRequestList));
-    gBS->FreePool (CacheEntry);
+    FreePool (CacheEntry);
 
     Count++;
   }
@@ -1399,7 +1399,7 @@ ArpCancelRequest (
         // No user requests any more, remove this request cache entry.
         //
         RemoveEntryList (&CacheEntry->List);
-        gBS->FreePool (CacheEntry);
+        FreePool (CacheEntry);
       }
     }
   }
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c
index 0f66580bec..0aad1584e0 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c
@@ -1,7 +1,7 @@
 /** @file
   Implementation of EFI Address Resolution Protocol (ARP) Protocol interface functions.
   
-Copyright (c) 2006, Intel Corporation.<BR>
+Copyright (c) 2006 - 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<BR>
@@ -628,7 +628,7 @@ ArpRequest (
     CacheEntry = ArpAllocCacheEntry (Instance);
     if (CacheEntry == NULL) {
       DEBUG ((EFI_D_ERROR, "ArpRequest: Allocate memory for CacheEntry failed.\n"));
-      gBS->FreePool (RequestContext);
+      FreePool (RequestContext);
 
       Status = EFI_OUT_OF_RESOURCES;
       goto UNLOCK_EXIT;
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
index 7c1fa4746a..0a43b606e1 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
@@ -525,7 +525,7 @@ DhcpChooseOffer (
     TempPacket = (EFI_DHCP4_PACKET *) AllocatePool (NewPacket->Size);
     if (TempPacket != NULL) {
       CopyMem (TempPacket, NewPacket, NewPacket->Size);
-      gBS->FreePool (Selected);
+      FreePool (Selected);
       Selected = TempPacket;
     }
   }
@@ -663,7 +663,7 @@ DhcpHandleSelect (
   return EFI_SUCCESS;
 
 ON_EXIT:
-  gBS->FreePool (Packet);
+  FreePool (Packet);
   return Status;
 }
 
@@ -749,14 +749,14 @@ DhcpHandleRequest (
   DhcpSb->IoStatus = EFI_SUCCESS;
   DhcpNotifyUser (DhcpSb, DHCP_NOTIFY_COMPLETION);
 
-  gBS->FreePool (Packet);
+  FreePool (Packet);
   return EFI_SUCCESS;
 
 REJECT:
   DhcpSendMessage (DhcpSb, DhcpSb->Selected, DhcpSb->Para, DHCP_MSG_DECLINE, Message);
 
 ON_EXIT:
-  gBS->FreePool (Packet);
+  FreePool (Packet);
   return Status;
 }
 
@@ -840,7 +840,7 @@ DhcpHandleRenewRebind (
   }
 
 ON_EXIT:
-  gBS->FreePool (Packet);
+  FreePool (Packet);
   return Status;
 }
 
@@ -926,7 +926,7 @@ DhcpHandleReboot (
   return EFI_SUCCESS;
 
 ON_EXIT:
-  gBS->FreePool (Packet);
+  FreePool (Packet);
   return Status;
 }
 
@@ -1046,7 +1046,7 @@ DhcpInput (
     //
     // Ignore the packet in INITREBOOT, INIT and BOUND states
     //
-    gBS->FreePool (Packet);
+    FreePool (Packet);
     Status = EFI_SUCCESS;
     break;
 
@@ -1077,7 +1077,7 @@ RESTART:
   NetbufFree (UdpPacket);
 
   if (Packet != NULL) {
-    gBS->FreePool (Packet);
+    FreePool (Packet);
   }
 
   Status = UdpIoRecvDatagram (DhcpSb->UdpIo, DhcpInput, DhcpSb, 0);
@@ -1099,7 +1099,7 @@ DhcpReleasePacket (
   IN VOID                   *Arg
   )
 {
-  gBS->FreePool (Arg);
+  FreePool (Arg);
 }
 
 
@@ -1319,12 +1319,12 @@ DhcpSendMessage (
   }
 
   if (EFI_ERROR (Status)) {
-    gBS->FreePool (Packet);
+    FreePool (Packet);
     return Status;
   }
 
   if (NewPacket != NULL) {
-    gBS->FreePool (Packet);
+    FreePool (Packet);
     Packet = NewPacket;
   }
 
@@ -1346,7 +1346,7 @@ DhcpSendMessage (
   Wrap      = NetbufFromExt (&Frag, 1, 0, 0, DhcpReleasePacket, Packet);
 
   if (Wrap == NULL) {
-    gBS->FreePool (Packet);
+    FreePool (Packet);
     return EFI_OUT_OF_RESOURCES;
   }
 
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c
index a3d20a75f9..97e9bb2b40 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.c
@@ -165,7 +165,7 @@ IScsiCHAPOnRspReceived (
   //
   KeyValueList = IScsiBuildKeyValueList ((CHAR8 *) Data, Len);
   if (KeyValueList == NULL) {
-    gBS->FreePool (Data);
+    FreePool (Data);
     return EFI_OUT_OF_RESOURCES;
   }
 
@@ -295,7 +295,7 @@ ON_EXIT:
 
   IScsiFreeKeyValueList (KeyValueList);
 
-  gBS->FreePool (Data);
+  FreePool (Data);
 
   return Status;
 }
@@ -422,8 +422,8 @@ IScsiCHAPToSendReq (
     break;
   }
 
-  gBS->FreePool (Response);
-  gBS->FreePool (Challenge);
+  FreePool (Response);
+  FreePool (Challenge);
 
   return Status;
 }
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
index 62fc37a3d4..25d89f54e3 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
@@ -168,9 +168,9 @@ IScsiUpdateDeviceList (
       gRT->SetVariable (MacString, &mIScsiCHAPAuthInfoGuid, 0, 0, NULL);
     }
 
-    gBS->FreePool (DeviceList);
+    FreePool (DeviceList);
   } else if (Status != EFI_NOT_FOUND) {
-    gBS->FreePool (Handles);
+    FreePool (Handles);
     return Status;
   }
   //
@@ -197,8 +197,8 @@ IScsiUpdateDeviceList (
         DeviceList
         );
 
-  gBS->FreePool (DeviceList);
-  gBS->FreePool (Handles);
+  FreePool (DeviceList);
+  FreePool (Handles);
 
   return Status;
 }
@@ -400,7 +400,7 @@ IScsiFormExtractConfig (
                                Results,
                                Progress
                                );
-  gBS->FreePool (IfrNvData);
+  FreePool (IfrNvData);
   return Status;
 }
 
@@ -873,7 +873,7 @@ IScsiConfigUpdateForm (
 
     mNumberOfIScsiDevices--;
     RemoveEntryList (&ConfigFormEntry->Link);
-    gBS->FreePool (ConfigFormEntry);
+    FreePool (ConfigFormEntry);
   }
   //
   // Allocate space for creation of Buffer
@@ -1055,7 +1055,7 @@ IScsiConfigFormUnload (
          &mCallbackInfo->ConfigAccess,
          NULL
          );
-  gBS->FreePool (mCallbackInfo);
+  FreePool (mCallbackInfo);
 
   return EFI_SUCCESS;
 }
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
index d0f2089246..996a290610 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
@@ -162,7 +162,7 @@ IScsiDhcpExtractRootPath (
 
 ON_EXIT:
 
-  gBS->FreePool (TmpStr);
+  FreePool (TmpStr);
 
   return Status;
 }
@@ -217,7 +217,7 @@ IScsiDhcpSelectOffer (
 
   Status = This->Parse (This, Packet, &OptionCount, OptionList);
   if (EFI_ERROR (Status)) {
-    gBS->FreePool (OptionList);
+    FreePool (OptionList);
     return EFI_NOT_READY;
   }
 
@@ -239,7 +239,7 @@ IScsiDhcpSelectOffer (
     Status = EFI_NOT_READY;
   }
 
-  gBS->FreePool (OptionList);
+  FreePool (OptionList);
 
   return Status;
 }
@@ -295,7 +295,7 @@ IScsiParseDhcpAck (
 
   Status = Dhcp4->Parse (Dhcp4, Dhcp4ModeData.ReplyPacket, &OptionCount, OptionList);
   if (EFI_ERROR (Status)) {
-    gBS->FreePool (OptionList);
+    FreePool (OptionList);
     return EFI_DEVICE_ERROR;
   }
 
@@ -330,7 +330,7 @@ IScsiParseDhcpAck (
     }
   }
 
-  gBS->FreePool (OptionList);
+  FreePool (OptionList);
 
   return Status;
 }
@@ -432,7 +432,7 @@ IScsiDoDhcp (
 ON_EXIT:
 
   if (ParaList != NULL) {
-    gBS->FreePool (ParaList);
+    FreePool (ParaList);
   }
 
   if (Dhcp4 != NULL) {
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
index 1d4aaed052..fd50b9d63e 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
@@ -1,7 +1,7 @@
 /** @file
   The entry point of IScsi driver.
 
-Copyright (c) 2004 - 2008, Intel Corporation.<BR>
+Copyright (c) 2004 - 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
@@ -371,7 +371,7 @@ EfiIScsiUnload (
     }
 
     if (DeviceHandleBuffer != NULL) {
-      gBS->FreePool (DeviceHandleBuffer);
+      FreePool (DeviceHandleBuffer);
     }
   }
   //
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
index 519423320b..2d951747ee 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
@@ -540,7 +540,7 @@ IScsiCreateDriverData (
                   &Private->ExitBootServiceEvent
                   );
   if (EFI_ERROR (Status)) {
-    gBS->FreePool (Private);
+    FreePool (Private);
     return NULL;
   }
 
@@ -565,7 +565,7 @@ IScsiCreateDriverData (
                   );
   if (EFI_ERROR (Status)) {
     gBS->CloseEvent (Private->ExitBootServiceEvent);
-    gBS->FreePool (Private);
+    FreePool (Private);
 
     return NULL;
   }
@@ -592,7 +592,7 @@ IScsiCleanDriverData (
           Private->DevicePath
           );
 
-    gBS->FreePool (Private->DevicePath);
+    FreePool (Private->DevicePath);
   }
 
   if (Private->ExtScsiPassThruHandle != NULL) {
@@ -605,7 +605,7 @@ IScsiCleanDriverData (
 
   gBS->CloseEvent (Private->ExitBootServiceEvent);
 
-  gBS->FreePool (Private);
+  FreePool (Private);
 }
 
 /**
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
index d73a961465..be339d8b08 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
@@ -215,7 +215,7 @@ IScsiCreateConnection (
                   &Conn->TimeoutEvent
                   );
   if (EFI_ERROR (Status)) {
-    gBS->FreePool (Conn);
+    FreePool (Conn);
     return NULL;
   }
 
@@ -246,7 +246,7 @@ IScsiCreateConnection (
             );
   if (EFI_ERROR (Status)) {
     gBS->CloseEvent (Conn->TimeoutEvent);
-    gBS->FreePool (Conn);
+    FreePool (Conn);
     Conn = NULL;
   }
 
@@ -266,7 +266,7 @@ IScsiDestroyConnection (
   Tcp4IoDestroySocket (&Conn->Tcp4Io);
   NetbufQueFlush (&Conn->RspQue);
   gBS->CloseEvent (Conn->TimeoutEvent);
-  gBS->FreePool (Conn);
+  FreePool (Conn);
 }
 
 /**
@@ -875,7 +875,7 @@ IScsiFreeNbufList (
   ASSERT (Arg != NULL);
 
   NetbufFreeList ((LIST_ENTRY     *) Arg);
-  gBS->FreePool (Arg);
+  FreePool (Arg);
 }
 
 /**
@@ -944,7 +944,7 @@ IScsiReceivePdu (
   Len     = sizeof (ISCSI_BASIC_HEADER) + (HeaderDigest ? sizeof (UINT32) : 0);
   PduHdr  = NetbufAlloc (Len);
   if (PduHdr == NULL) {
-    gBS->FreePool (NbufList);
+    FreePool (NbufList);
     return EFI_OUT_OF_RESOURCES;
   }
 
@@ -1134,7 +1134,7 @@ IScsiCheckOpParams (
   //
   KeyValueList = IScsiBuildKeyValueList (Data, Len);
   if (KeyValueList == NULL) {
-    gBS->FreePool (Data);
+    FreePool (Data);
     return Status;
   }
   //
@@ -1337,7 +1337,7 @@ ON_ERROR:
 
   IScsiFreeKeyValueList (KeyValueList);
 
-  gBS->FreePool (Data);
+  FreePool (Data);
 
   return Status;
 }
@@ -1485,7 +1485,7 @@ IScsiBuildKeyValueList (
       Data++;
       Len--;
     } else {
-      gBS->FreePool (KeyValuePair);
+      FreePool (KeyValuePair);
       goto ON_ERROR;
     }
 
@@ -1534,7 +1534,7 @@ IScsiGetValueByKeyFromList (
       Value = KeyValuePair->Value;
 
       RemoveEntryList (&KeyValuePair->List);
-      gBS->FreePool (KeyValuePair);
+      FreePool (KeyValuePair);
       break;
     }
   }
@@ -1559,10 +1559,10 @@ IScsiFreeKeyValueList (
     Entry         = NetListRemoveHead (KeyValueList);
     KeyValuePair  = NET_LIST_USER_STRUCT (Entry, ISCSI_KEY_VALUE_PAIR, List);
 
-    gBS->FreePool (KeyValuePair);
+    FreePool (KeyValuePair);
   }
 
-  gBS->FreePool (KeyValueList);
+  FreePool (KeyValueList);
 }
 
 /**
@@ -1678,7 +1678,7 @@ IScsiDelTcb (
 {
   RemoveEntryList (&Tcb->Link);
 
-  gBS->FreePool (Tcb);
+  FreePool (Tcb);
 }
 
 /**
@@ -1969,7 +1969,7 @@ IScsiNewDataOutPdu (
   //
   PduHdr = NetbufAlloc (sizeof (ISCSI_SCSI_DATA_OUT));
   if (PduHdr == NULL) {
-    gBS->FreePool (NbufList);
+    FreePool (NbufList);
     return NULL;
   }
   //
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c
index ee734d9914..7f63e8de19 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c
@@ -1,7 +1,7 @@
 /** @file
   The wrap of TCP/IP Socket interface.
 
-Copyright (c) 2004 - 2007, Intel Corporation.<BR>
+Copyright (c) 2004 - 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
@@ -386,7 +386,7 @@ Tcp4IoTransmit (
 
 ON_EXIT:
 
-  gBS->FreePool (TxData);
+  FreePool (TxData);
 
   return Status;
 }
@@ -481,7 +481,7 @@ Tcp4IoReceive (
 
 ON_EXIT:
   Tcp4Io->RxToken.Packet.RxData = NULL;
-  gBS->FreePool (Fragment);
+  FreePool (Fragment);
 
   return Status;
 }
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
index fa0445e247..5f8821a4d6 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
@@ -49,7 +49,7 @@ Ip4ConfigGetNicInfo (
   Config = Ip4ConfigFindNicVariable (Variable, NicAddr);
 
   if (Config == NULL) {
-    gBS->FreePool (Variable);
+    FreePool (Variable);
     return NULL;
   }
 
@@ -62,14 +62,14 @@ Ip4ConfigGetNicInfo (
     Ip4ConfigWriteVariable (NewVariable);
 
     if (NewVariable != NULL) {
-      gBS->FreePool (NewVariable);
+      FreePool (NewVariable);
     };
 
-    gBS->FreePool (Config);
+    FreePool (Config);
     Config = NULL;
   }
 
-  gBS->FreePool (Variable);
+  FreePool (Variable);
   return Config;
 }
 
@@ -131,7 +131,7 @@ EfiNicIp4ConfigGetInfo (
 
   *ConfigLen = Len;
 
-  gBS->FreePool (Config);
+  FreePool (Config);
   return Status;
 }
 
@@ -200,14 +200,14 @@ EfiNicIp4ConfigSetInfo (
   Status      = Ip4ConfigWriteVariable (NewVariable);
 
   if (NewVariable != NULL) {
-    gBS->FreePool (NewVariable);
+    FreePool (NewVariable);
   }
 
   //
   // Variable is NULL when saving the first configure parameter
   //
   if (Variable != NULL) {
-    gBS->FreePool (Variable);
+    FreePool (Variable);
   }
 
   if (EFI_ERROR (Status)) {
@@ -277,7 +277,7 @@ Ip4ConfigOnDhcp4Complete (
     if (Instance->NicConfig != NULL) {
       ASSERT (Instance->NicConfig->Source == IP4_CONFIG_SOURCE_DHCP);
       Perment = Instance->NicConfig->Perment;
-      gBS->FreePool (Instance->NicConfig);
+      FreePool (Instance->NicConfig);
     }
 
     Instance->NicConfig = AllocatePool (sizeof (NIC_IP4_CONFIG_INFO) + 2* sizeof (EFI_IP4_ROUTE_TABLE));
@@ -741,7 +741,7 @@ Ip4ConfigCleanConfig (
   )
 {
   if (Instance->NicConfig != NULL) {
-    gBS->FreePool (Instance->NicConfig);
+    FreePool (Instance->NicConfig);
     Instance->NicConfig = NULL;
   }
 
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
index 503c7cb814..a31a605c99 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
@@ -335,21 +335,21 @@ Ip4ConfigDriverBindingStart (
   Ip4ConfigWriteVariable (NewVariable);
 
   if (NewVariable != NULL) {
-    gBS->FreePool (NewVariable);
+    FreePool (NewVariable);
   }
 
 ON_EXIT:
-  gBS->FreePool (Variable);
+  FreePool (Variable);
 
   if (NicConfig != NULL) {
-    gBS->FreePool (NicConfig);
+    FreePool (NicConfig);
   }
 
   return EFI_SUCCESS;
 
 ON_ERROR:
   if (Instance != NULL) {
-    gBS->FreePool (Instance);
+    FreePool (Instance);
   }
 
   if (Mnp != NULL) {
@@ -506,7 +506,7 @@ Ip4ConfigDriverBindingStop (
 
   Ip4ConfigCleanConfig (Instance);
   mIp4ConfigNicList[Instance->NicIndex] = NULL;
-  gBS->FreePool (Instance);
+  FreePool (Instance);
 
   return EFI_SUCCESS;
 }
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
index c97184ae2d..9e7850072b 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
@@ -1039,7 +1039,7 @@ Ip4ConfigUpdateForm (
 
     mNumberOfIp4Devices--;
     RemoveEntryList (&ConfigFormEntry->Link);
-    gBS->FreePool (ConfigFormEntry);
+    FreePool (ConfigFormEntry);
   }
 
   //
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c
index 17709af107..86f56941bc 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c
@@ -151,7 +151,7 @@ REMOVE_VARIABLE:
 
 ON_ERROR:
   if (Variable != NULL) {
-    gBS->FreePool (Variable);
+    FreePool (Variable);
   }
 
   return NULL;
@@ -296,7 +296,7 @@ Ip4ConfigModifyVariable (
 
     if (Old != NULL) {
       TotalLen -= SIZEOF_NIC_IP4_CONFIG_INFO (Old);
-      gBS->FreePool (Old);
+      FreePool (Old);
     }
 
     if (Config != NULL) {
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;
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
index 381f8b87b8..7659d7ef10 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
@@ -377,7 +377,7 @@ ERROR:
 
     if (MnpServiceData->TxBuf != NULL) {
 
-      gBS->FreePool (MnpServiceData->TxBuf);
+      FreePool (MnpServiceData->TxBuf);
     }
 
     if (MnpServiceData->RxNbufCache != NULL) {
@@ -425,7 +425,7 @@ MnpFlushServiceData (
   //
   // Free the tx buffer.
   //
-  gBS->FreePool (MnpServiceData->TxBuf);
+  FreePool (MnpServiceData->TxBuf);
 
   //
   // Free the RxNbufCache.
@@ -1152,7 +1152,7 @@ MnpConfigReceiveFilters (
     //
     // Free the buffer used to hold the group addresses.
     //
-    gBS->FreePool (MCastFilter);
+    FreePool (MCastFilter);
   }
 
   return Status;
@@ -1257,7 +1257,7 @@ MnpGroupOpDelCtrlBlk (
   //
   GroupAddress = CtrlBlk->GroupAddress;
   RemoveEntryList (&CtrlBlk->CtrlBlkEntry);
-  gBS->FreePool (CtrlBlk);
+  FreePool (CtrlBlk);
 
   ASSERT (GroupAddress->RefCnt > 0);
 
@@ -1272,7 +1272,7 @@ MnpGroupOpDelCtrlBlk (
     //
     MnpServiceData->GroupAddressCount--;
     RemoveEntryList (&GroupAddress->AddrEntry);
-    gBS->FreePool (GroupAddress);
+    FreePool (GroupAddress);
 
     return TRUE;
   }
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
index 9541fb18e8..7581b02e23 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
@@ -1,7 +1,7 @@
 /** @file
   Implementation of driver entry point and driver binding protocol.
 
-Copyright (c) 2005 - 2008, 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 
@@ -171,7 +171,7 @@ ErrorExit:
       MnpFlushServiceData (MnpServiceData, This->DriverBindingHandle);
     }
 
-    gBS->FreePool (MnpServiceData);
+    FreePool (MnpServiceData);
   }
 
   return Status;
@@ -248,7 +248,7 @@ MnpDriverBindingStop (
     //
     MnpFlushServiceData (MnpServiceData, This->DriverBindingHandle);
 
-    gBS->FreePool (MnpServiceData);
+    FreePool (MnpServiceData);
   } else {
     while (!IsListEmpty (&MnpServiceData->ChildrenList)) {
       //
@@ -376,7 +376,7 @@ ErrorExit:
             );
     }
 
-    gBS->FreePool (Instance);
+    FreePool (Instance);
   }
 
   return Status;
@@ -511,7 +511,7 @@ MnpServiceBindingDestroyChild (
 
   gBS->RestoreTPL (OldTpl);
 
-  gBS->FreePool (Instance);
+  FreePool (Instance);
 
   return Status;
 }
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
index a7b703f8a8..8cc7db8ad2 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
@@ -454,7 +454,7 @@ MnpRecycleRxData (
   //
   RemoveEntryList (&RxDataWrap->WrapEntry);
 
-  gBS->FreePool (RxDataWrap);
+  FreePool (RxDataWrap);
 }
 
 
@@ -739,7 +739,7 @@ MnpWrapRxData (
   if (EFI_ERROR (Status)) {
 
     DEBUG ((EFI_D_ERROR, "MnpDispatchPacket: gBS->CreateEvent failed, %r.\n", Status));
-    gBS->FreePool (RxDataWrap);
+    FreePool (RxDataWrap);
     return NULL;
   }
 
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
index 63dcc6c5df..8ceb248064 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
@@ -180,7 +180,7 @@ Mtftp4CreateService (
                   );
 
   if (EFI_ERROR (Status)) {
-    gBS->FreePool (MtftpSb);
+    FreePool (MtftpSb);
     return Status;
   }
 
@@ -197,7 +197,7 @@ Mtftp4CreateService (
                   );
   if (EFI_ERROR (Status)) {
     gBS->CloseEvent (MtftpSb->Timer);
-    gBS->FreePool (MtftpSb);
+    FreePool (MtftpSb);
     return Status;
   }
 
@@ -212,7 +212,7 @@ Mtftp4CreateService (
   if (MtftpSb->ConnectUdp == NULL) {
     gBS->CloseEvent (MtftpSb->TimerToGetMap);
     gBS->CloseEvent (MtftpSb->Timer);
-    gBS->FreePool (MtftpSb);
+    FreePool (MtftpSb);
     return EFI_DEVICE_ERROR;
   }
 
@@ -311,7 +311,7 @@ Mtftp4DriverBindingStart (
 
 ON_ERROR:
   Mtftp4CleanService (MtftpSb);
-  gBS->FreePool (MtftpSb);
+  FreePool (MtftpSb);
 
   return Status;
 }
@@ -390,7 +390,7 @@ Mtftp4DriverBindingStop (
 
     Mtftp4CleanService (MtftpSb);
 
-    gBS->FreePool (MtftpSb);
+    FreePool (MtftpSb);
   } else {
 
     while (!IsListEmpty (&MtftpSb->Children)) {
@@ -482,7 +482,7 @@ Mtftp4ServiceBindingCreateChild (
                             );
 
   if (Instance->UnicastPort == NULL) {
-    gBS->FreePool (Instance);
+    FreePool (Instance);
     return EFI_OUT_OF_RESOURCES;
   }
 
@@ -538,7 +538,7 @@ ON_ERROR:
 
   if (EFI_ERROR (Status)) {
     UdpIoFreeIo (Instance->UnicastPort);
-    gBS->FreePool (Instance);
+    FreePool (Instance);
   }
 
   return Status;
@@ -637,6 +637,6 @@ Mtftp4ServiceBindingDestroyChild (
 
   gBS->RestoreTPL (OldTpl);
 
-  gBS->FreePool (Instance);
+  FreePool (Instance);
   return EFI_SUCCESS;
 }
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
index 229a35578a..3d92ba3dd1 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
@@ -65,7 +65,7 @@ Mtftp4CleanOperation (
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &Instance->Blocks) {
     Block = NET_LIST_USER_STRUCT (Entry, MTFTP4_BLOCK_RANGE, Link);
     RemoveEntryList (Entry);
-    gBS->FreePool (Block);
+    FreePool (Block);
   }
 
   ZeroMem (&Instance->RequestOption, sizeof (MTFTP4_OPTION));
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.c
index 19157a7506..93e548ea1c 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.c
@@ -1,7 +1,7 @@
 /** @file
   Routines to process MTFTP4 options.
   
-Copyright (c) 2006 - 2007, Intel Corporation<BR>
+Copyright (c) 2006 - 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
@@ -528,6 +528,6 @@ Mtftp4ParseOptionOack (
 
   Status = Mtftp4ParseOption (OptionList, Count, FALSE, MtftpOption);
 
-  gBS->FreePool (OptionList);
+  FreePool (OptionList);
   return Status;
 }
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
index 524db8ff63..4a15aeb970 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
@@ -743,7 +743,7 @@ ON_EXIT:
   // receive, otherwise end the session.
   //
   if ((Packet != NULL) && (UdpPacket->BlockOpNum > 1)) {
-    gBS->FreePool (Packet);
+    FreePool (Packet);
   }
 
   if (UdpPacket != NULL) {
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
index a758f4bb0c..0e7f98e33a 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
@@ -139,7 +139,7 @@ Mtftp4SetLastBlockNum (
 
     if (Range->Start > Last) {
       RemoveEntryList (&Range->Link);
-      gBS->FreePool (Range);
+      FreePool (Range);
       continue;
     }
 
@@ -209,7 +209,7 @@ Mtftp4RemoveBlockNum (
 
       if (Range->Start > Range->End) {
         RemoveEntryList (&Range->Link);
-        gBS->FreePool (Range);
+        FreePool (Range);
       }
 
       return EFI_SUCCESS;
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
index 87ec0c1d64..00309f4451 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
@@ -91,7 +91,7 @@ Mtftp4WrqSendBlock (
 
     if (EFI_ERROR (Status) || (DataLen > Instance->BlkSize)) {
       if (DataBuf != NULL) {
-        gBS->FreePool (DataBuf);
+        FreePool (DataBuf);
       }
 
       Mtftp4SendError (
@@ -111,7 +111,7 @@ Mtftp4WrqSendBlock (
     if (DataLen > 0) {
       NetbufAllocSpace (UdpPacket, DataLen, FALSE);
       CopyMem (Packet->Data.Data, DataBuf, DataLen);
-      gBS->FreePool (DataBuf);
+      FreePool (DataBuf);
     }
   }
 
@@ -462,7 +462,7 @@ ON_EXIT:
   // restart the receive, otherwise end the session.
   //
   if ((Packet != NULL) && (UdpPacket->BlockOpNum > 1)) {
-    gBS->FreePool (Packet);
+    FreePool (Packet);
   }
 
   if (UdpPacket != NULL) {
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
index dad64ae447..d36ab2748b 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockImpl.c
@@ -345,7 +345,7 @@ SockFlushPendingToken (
     SIGNAL_TOKEN (Token, Sock->SockError);
 
     RemoveEntryList (&(SockToken->TokenList));
-    gBS->FreePool (SockToken);
+    FreePool (SockToken);
   }
 }
 
@@ -407,7 +407,7 @@ SockWakeListenToken (
     SIGNAL_TOKEN (&(ListenToken->CompletionToken), EFI_SUCCESS);
 
     RemoveEntryList (&SockToken->TokenList);
-    gBS->FreePool (SockToken);
+    FreePool (SockToken);
 
     RemoveEntryList (&Sock->ConnectionList);
 
@@ -457,7 +457,7 @@ SockWakeRcvToken (
     }
 
     RemoveEntryList (&(SockToken->TokenList));
-    gBS->FreePool (SockToken);
+    FreePool (SockToken);
     RcvdBytes -= TokenRcvdBytes;
   }
 }
@@ -535,7 +535,7 @@ OnError:
 
   RemoveEntryList (&SockToken->TokenList);
   SIGNAL_TOKEN (SockToken->Token, Status);
-  gBS->FreePool (SockToken);
+  FreePool (SockToken);
 }
 
 
@@ -699,7 +699,7 @@ OnError:
     NetbufQueFree (Sock->RcvBuffer.DataQueue);
   }
 
-  gBS->FreePool (Sock);
+  FreePool (Sock);
 
   return NULL;
 }
@@ -799,7 +799,7 @@ SockDestroy (
         );
 
 FreeSock:
-  gBS->FreePool (Sock);
+  FreePool (Sock);
   return ;
 }
 
@@ -1032,7 +1032,7 @@ SockDataSent (
       RemoveEntryList (&(SockToken->TokenList));
       SIGNAL_TOKEN (SndToken, EFI_SUCCESS);
       Count -= SockToken->RemainDataLen;
-      gBS->FreePool (SockToken);
+      FreePool (SockToken);
     } else {
 
       SockToken->RemainDataLen -= Count;
@@ -1180,7 +1180,7 @@ SockRcvdErr (
 
     SIGNAL_TOKEN (SockToken->Token, Error);
 
-    gBS->FreePool (SockToken);
+    FreePool (SockToken);
   } else {
 
     SOCK_ERROR (Sock, Error);
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
index 017d6e4328..daf788aab6 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/SockInterface.c
@@ -593,7 +593,7 @@ SockSend (
         "Snd Data\n", Status));
 
       RemoveEntryList (&(SockToken->TokenList));
-      gBS->FreePool (SockToken);
+      FreePool (SockToken);
     }
   }
 
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
index fb224f4ad3..d38c10172e 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
@@ -234,7 +234,7 @@ Tcp4FlushPcb (
            &gEfiDevicePathProtocolGuid,
            Sock->DevicePath
            );
-    gBS->FreePool (Sock->DevicePath);
+    FreePool (Sock->DevicePath);
 
     TcpSetVariableData (TcpProto->TcpService);
   }
@@ -279,7 +279,7 @@ Tcp4AttachPcb (
   Tcb->IpInfo = IpIoAddIp (IpIo);
   if (Tcb->IpInfo == NULL) {
 
-    gBS->FreePool (Tcb);
+    FreePool (Tcb);
     return EFI_OUT_OF_RESOURCES;
   }
 
@@ -317,7 +317,7 @@ Tcp4DetachPcb (
 
   IpIoRemoveIp (ProtoData->TcpService->IpIo, Tcb->IpInfo);
 
-  gBS->FreePool (Tcb);
+  FreePool (Tcb);
 
   ProtoData->TcpPcb = NULL;
 }
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
index f48eb8c096..f6897e9fb6 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
@@ -389,7 +389,7 @@ ON_ERROR:
     IpIoDestroy (TcpServiceData->IpIo);
   }
 
-  gBS->FreePool (TcpServiceData);
+  FreePool (TcpServiceData);
 
   return Status;
 }
@@ -494,7 +494,7 @@ Tcp4DriverBindingStop (
     //
     // Release the TCP service data
     //
-    gBS->FreePool (TcpServiceData);
+    FreePool (TcpServiceData);
   } else {
 
     while (!IsListEmpty (&TcpServiceData->SocketList)) {
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
index f565d2f3d0..8c0293dccd 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
@@ -432,7 +432,7 @@ TcpCloneTcb (
   Clone->Sk = SockClone (Tcb->Sk);
   if (Clone->Sk == NULL) {
     DEBUG ((EFI_D_ERROR, "TcpCloneTcb: failed to clone a sock\n"));
-    gBS->FreePool (Clone);
+    FreePool (Clone);
     return NULL;
   }
 
@@ -1025,7 +1025,7 @@ TcpSetVariableData (
              );
     }
 
-    gBS->FreePool (Tcp4Service->MacString);
+    FreePool (Tcp4Service->MacString);
   }
 
   Tcp4Service->MacString = NewMacString;
@@ -1040,7 +1040,7 @@ TcpSetVariableData (
 
 ON_ERROR:
 
-  gBS->FreePool (Tcp4VariableData);
+  FreePool (Tcp4VariableData);
 
   return Status;
 }
@@ -1067,7 +1067,7 @@ TcpClearVariableData (
          NULL
          );
 
-  gBS->FreePool (Tcp4Service->MacString);
+  FreePool (Tcp4Service->MacString);
   Tcp4Service->MacString = NULL;
 }
 
@@ -1121,7 +1121,7 @@ TcpInstallDevicePath (
                   Sock->DevicePath
                   );
   if (EFI_ERROR (Status)) {
-    gBS->FreePool (Sock->DevicePath);
+    FreePool (Sock->DevicePath);
   }
 
   return Status;
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
index c063d41b42..d313601a5e 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2006, Intel Corporation.<BR>
+Copyright (c) 2006 - 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
@@ -127,7 +127,7 @@ Udp4DriverBindingStart (
 
   Status = Udp4CreateService (Udp4Service, This->DriverBindingHandle, ControllerHandle);
   if (EFI_ERROR (Status)) {
-    gBS->FreePool (Udp4Service);
+    FreePool (Udp4Service);
     return Status;
   }
 
@@ -142,7 +142,7 @@ Udp4DriverBindingStart (
                   );
   if (EFI_ERROR (Status)) {
     Udp4CleanService (Udp4Service);
-    gBS->FreePool (Udp4Service);
+    FreePool (Udp4Service);
   } else {
     Udp4SetVariableData (Udp4Service);
   }
@@ -222,7 +222,7 @@ Udp4DriverBindingStop (
 
     Udp4CleanService (Udp4Service);
 
-    gBS->FreePool (Udp4Service);
+    FreePool (Udp4Service);
   } else {
 
     while (!IsListEmpty (&Udp4Service->ChildrenList)) {
@@ -352,7 +352,7 @@ ON_ERROR:
 
   Udp4CleanInstance (Instance);
 
-  gBS->FreePool (Instance);
+  FreePool (Instance);
 
   return Status;
 }
@@ -470,7 +470,7 @@ Udp4ServiceBindingDestroyChild (
 
   gBS->RestoreTPL (OldTpl);
 
-  gBS->FreePool (Instance);
+  FreePool (Instance);
 
   return EFI_SUCCESS;
 }
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
index 3c0e65f717..710d0f9f59 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
@@ -1363,7 +1363,7 @@ Udp4RecycleRxDataWrap (
   //
   gBS->CloseEvent (Wrap->RxData.RecycleSignal);
 
-  gBS->FreePool (Wrap);
+  FreePool (Wrap);
 }
 
 
@@ -1413,7 +1413,7 @@ Udp4WrapRxData (
                   &Wrap->RxData.RecycleSignal
                   );
   if (EFI_ERROR (Status)) {
-    gBS->FreePool (Wrap);
+    FreePool (Wrap);
     return NULL;
   }
 
@@ -2012,7 +2012,7 @@ Udp4SetVariableData (
              );
     }
 
-    gBS->FreePool (Udp4Service->MacString);
+    FreePool (Udp4Service->MacString);
   }
 
   Udp4Service->MacString = NewMacString;
@@ -2027,7 +2027,7 @@ Udp4SetVariableData (
 
 ON_ERROR:
 
-  gBS->FreePool (Udp4VariableData);
+  FreePool (Udp4VariableData);
 
   return Status;
 }
@@ -2054,6 +2054,6 @@ Udp4ClearVariableData (
          NULL
          );
 
-  gBS->FreePool (Udp4Service->MacString);
+  FreePool (Udp4Service->MacString);
   Udp4Service->MacString = NULL;
 }
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
index 5e86cf5779..de21a444ce 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
@@ -1161,7 +1161,7 @@ PxeBcDiscvBootService (
   Status = Dhcp4->Build (Dhcp4, &Private->SeedPacket, 0, NULL, OptCount, OptList, &Token.Packet);
 
   if (IsDiscv) {
-    gBS->FreePool (OptList[OptCount - 1]);
+    FreePool (OptList[OptCount - 1]);
   }
 
   if (EFI_ERROR (Status)) {
@@ -1270,12 +1270,12 @@ PxeBcDiscvBootService (
     //
     // free the responselist
     //
-    gBS->FreePool (Token.ResponseList);
+    FreePool (Token.ResponseList);
   }
   //
   // Free the dhcp packet
   //
-  gBS->FreePool (Token.Packet);
+  FreePool (Token.Packet);
 
   return Status;
 }
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
index a4951c88fd..eaa3c03b6e 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDriver.c
@@ -463,7 +463,7 @@ ON_ERROR:
       );
   }
 
-  gBS->FreePool (Private);
+  FreePool (Private);
 
   return Status;
 }
@@ -626,7 +626,7 @@ PxeBcDriverBindingStop (
       Private->ArpChild
       );
 
-    gBS->FreePool (Private);
+    FreePool (Private);
   }
 
   return Status;
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
index e04ae3a8ae..d548e6726a 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
@@ -1376,7 +1376,7 @@ ON_EXIT:
     gBS->CloseEvent (Token.Event);
   }
 
-  gBS->FreePool (Udp4TxData);
+  FreePool (Udp4TxData);
 
   return Status;
 }
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c
index 8ea6fed516..1dbe32d160 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcMtftp.c
@@ -196,12 +196,12 @@ PxeBcTftpGetFileSize (
     OptCnt--;
   }
 
-  gBS->FreePool (Option);
+  FreePool (Option);
 
 ON_ERROR:
 
   if (Packet != NULL) {
-    gBS->FreePool (Packet);
+    FreePool (Packet);
   }
 
   Mtftp4->Configure (Mtftp4, NULL);
-- 
2.39.2