Add VLAN support.

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

2 files changed, 3 insertions, 13 deletions

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h
index e8814a1..457b6da 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h
@@ -89,7 +89,7 @@ typedef struct _IP4_CONFIG_FORM_ENTRY {
   LIST_ENTRY                    Link;

   IP4_CONFIG_INSTANCE           *Ip4ConfigInstance;

   EFI_HANDLE                    Controller;

-  CHAR16                        MacString[95];

+  CHAR16                        *MacString;

   EFI_STRING_ID                 PortTitleToken;

   EFI_STRING_ID                 PortTitleHelpToken;

   IP4_CONFIG_SESSION_DATA       SessionConfigData;

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
index 9e78500..d7a04b6 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
@@ -970,7 +970,6 @@ Ip4ConfigUpdateForm (
   IP4CONFIG_FORM_ENTRY        *ConfigFormEntry;

   BOOLEAN                     EntryExisted;

   EFI_STATUS                  Status;

-  EFI_SIMPLE_NETWORK_PROTOCOL *Snp;

   CHAR16                      PortString[128];

   UINT16                      FormIndex;

   VOID                        *StartOpCodeHandle;

@@ -1006,19 +1005,9 @@ Ip4ConfigUpdateForm (
       InitializeListHead (&ConfigFormEntry->Link);

       ConfigFormEntry->Controller = Instance->Controller;

 

-      //

-      // Get the simple network protocol and convert the MAC address into

-      // the formatted string.

-      //

-      Status = gBS->HandleProtocol (

-                      Instance->Controller,

-                      &gEfiSimpleNetworkProtocolGuid,

-                      (VOID **)&Snp

-                      );

+      Status = NetLibGetMacString (Instance->Controller, Instance->Image, &ConfigFormEntry->MacString);

       ASSERT (Status == EFI_SUCCESS);

 

-      Ip4MacAddrToStr (&Snp->Mode->PermanentAddress, Snp->Mode->HwAddressSize, ConfigFormEntry->MacString);

-

       //

       // Compose the Port string and create a new EFI_STRING_ID.

       //

@@ -1039,6 +1028,7 @@ Ip4ConfigUpdateForm (
 

     mNumberOfIp4Devices--;

     RemoveEntryList (&ConfigFormEntry->Link);

+    FreePool (ConfigFormEntry->MacString);

     FreePool (ConfigFormEntry);

   }