Add VLAN support.

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Ip4ConfigDxe / Ip4ConfigNv.c

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
index 9e7850072ba6df1b37c8ddec6481467195d1ebdc..d7a04b60b4778134cb7cd2cc531a0fa468c4184d 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
@@ -970,7 +970,6 @@ Ip4ConfigUpdateForm (
   IP4CONFIG_FORM_ENTRY        *ConfigFormEntry;\r
   BOOLEAN                     EntryExisted;\r
   EFI_STATUS                  Status;\r
-  EFI_SIMPLE_NETWORK_PROTOCOL *Snp;\r
   CHAR16                      PortString[128];\r
   UINT16                      FormIndex;\r
   VOID                        *StartOpCodeHandle;\r
@@ -1006,19 +1005,9 @@ Ip4ConfigUpdateForm (
       InitializeListHead (&ConfigFormEntry->Link);\r
       ConfigFormEntry->Controller = Instance->Controller;\r
 \r
-      //\r
-      // Get the simple network protocol and convert the MAC address into\r
-      // the formatted string.\r
-      //\r
-      Status = gBS->HandleProtocol (\r
-                      Instance->Controller,\r
-                      &gEfiSimpleNetworkProtocolGuid,\r
-                      (VOID **)&Snp\r
-                      );\r
+      Status = NetLibGetMacString (Instance->Controller, Instance->Image, &ConfigFormEntry->MacString);\r
       ASSERT (Status == EFI_SUCCESS);\r
 \r
-      Ip4MacAddrToStr (&Snp->Mode->PermanentAddress, Snp->Mode->HwAddressSize, ConfigFormEntry->MacString);\r
-\r
       //\r
       // Compose the Port string and create a new EFI_STRING_ID.\r
       //\r
@@ -1039,6 +1028,7 @@ Ip4ConfigUpdateForm (
 \r
     mNumberOfIp4Devices--;\r
     RemoveEntryList (&ConfigFormEntry->Link);\r
+    FreePool (ConfigFormEntry->MacString);\r
     FreePool (ConfigFormEntry);\r
   }\r
 \r