Clean up the private GUID definition in module Level.

[mirror_edk2.git] / NetworkPkg / UefiPxeBcDxe / PxeBcDriver.c

diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
index e4ab9557a10a803e1cd582635ea6f47219e1d1ac..8cfc8fb93cbbb83c1b8a1d26937e360da6bdf511 100644 (file)
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
@@ -25,14 +25,6 @@ EFI_DRIVER_BINDING_PROTOCOL gPxeBcDriverBinding = {
   NULL\r
 };\r
 \r
-//\r
-// PXE_PRIVATE_GUID is only used to keep the relationship between \r
-// NIC handle and virtual child handles.\r
-//\r
-EFI_GUID mPxeBcPrivateGuid = PXEBC_PRIVATE_GUID;\r
-\r
-\r
-\r
 /**\r
   Get the Nic handle using any child handle in the IPv4 stack.\r
 \r
@@ -237,7 +229,7 @@ PxeBcDestroyIp4Children (
     //\r
     gBS->CloseProtocol (\r
            Private->Controller,\r
-           &mPxeBcPrivateGuid,\r
+           &gEfiCallerIdGuid,\r
            This->DriverBindingHandle,\r
            Private->Ip4Nic->Controller\r
            );\r
@@ -397,7 +389,7 @@ PxeBcDestroyIp6Children (
     //\r
     gBS->CloseProtocol (\r
            Private->Controller,\r
-           &mPxeBcPrivateGuid,\r
+           &gEfiCallerIdGuid,\r
            This->DriverBindingHandle,\r
            Private->Ip6Nic->Controller\r
            );\r
@@ -722,7 +714,7 @@ PxeBcCreateIp4Children (
   //\r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
-                  &mPxeBcPrivateGuid,\r
+                  &gEfiCallerIdGuid,\r
                   (VOID **) &Id,\r
                   This->DriverBindingHandle,\r
                   Private->Ip4Nic->Controller,\r
@@ -1030,7 +1022,7 @@ PxeBcCreateIp6Children (
   //\r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
-                  &mPxeBcPrivateGuid,\r
+                  &gEfiCallerIdGuid,\r
                   (VOID **) &Id,\r
                   This->DriverBindingHandle,\r
                   Private->Ip6Nic->Controller,\r
@@ -1214,7 +1206,7 @@ PxeBcDriverBindingStart (
 \r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
-                  &mPxeBcPrivateGuid,\r
+                  &gEfiCallerIdGuid,\r
                   (VOID **) &Id,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
@@ -1282,10 +1274,13 @@ PxeBcDriverBindingStart (
 \r
     //\r
     // Install PxeBaseCodePrivate protocol onto the real NIC handler.\r
+    // PxeBaseCodePrivate protocol is only used to keep the relationship between \r
+    // NIC handle and virtual child handles.\r
+    // gEfiCallerIdGuid will be used as its protocol guid.\r
     //\r
     Status = gBS->InstallProtocolInterface (\r
                     &ControllerHandle,\r
-                    &mPxeBcPrivateGuid,\r
+                    &gEfiCallerIdGuid,\r
                     EFI_NATIVE_INTERFACE,\r
                     &Private->Id\r
                     );\r
@@ -1322,7 +1317,7 @@ PxeBcDriverBindingStart (
 ON_ERROR:\r
   gBS->UninstallProtocolInterface (\r
          ControllerHandle,\r
-         &mPxeBcPrivateGuid,\r
+         &gEfiCallerIdGuid,\r
          &Private->Id\r
          );\r
   PxeBcDestroyIp4Children (This, Private);\r
@@ -1403,7 +1398,7 @@ PxeBcDriverBindingStop (
     //\r
     Status = gBS->OpenProtocol (\r
                     NicHandle,\r
-                    &mPxeBcPrivateGuid,\r
+                    &gEfiCallerIdGuid,\r
                     (VOID **) &Id,\r
                     This->DriverBindingHandle,\r
                     ControllerHandle,\r
@@ -1459,7 +1454,7 @@ PxeBcDriverBindingStop (
   if (Private->Ip4Nic == NULL && Private->Ip6Nic == NULL) {\r
     gBS->UninstallProtocolInterface (\r
            NicHandle,\r
-           &mPxeBcPrivateGuid,\r
+           &gEfiCallerIdGuid,\r
            &Private->Id\r
            );\r
     FreePool (Private);\r