From 928927dd8ea2561649f0027a8a6836797fb4bdd7 Mon Sep 17 00:00:00 2001 From: Samer El-Haj-Mahmoud elhaj Date: Tue, 1 Oct 2013 22:12:51 +0000 Subject: [PATCH] Fix spelling typo in the NIC_IP4_CONFIG_INFO.Permanent variable name, which was incorrectly called NIC_IP4_CONFIG_INFO.Perment Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Samer El-Haj-Mahmoud elhaj@hp.com Reviewed-by: Jaben Carsey git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14743 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Include/Guid/NicIp4ConfigNvData.h | 2 +- .../Universal/Network/Ip4ConfigDxe/Ip4Config.c | 8 ++++---- .../Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c | 2 +- .../Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c | 2 +- NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c | 2 +- .../Library/UefiShellNetwork1CommandsLib/Ifconfig.c | 10 +++++----- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/MdeModulePkg/Include/Guid/NicIp4ConfigNvData.h b/MdeModulePkg/Include/Guid/NicIp4ConfigNvData.h index b25308131e..d3ce76f051 100644 --- a/MdeModulePkg/Include/Guid/NicIp4ConfigNvData.h +++ b/MdeModulePkg/Include/Guid/NicIp4ConfigNvData.h @@ -61,7 +61,7 @@ typedef struct { typedef struct { NIC_ADDR NicAddr; ///< Link layer address to identify the NIC. UINT32 Source; ///< Static or DHCP. - BOOLEAN Perment; ///< Survive the reboot or not. + BOOLEAN Permanent; ///< Survive the reboot or not. EFI_IP4_IPCONFIG_DATA Ip4Info; ///< IP addresses. } NIC_IP4_CONFIG_INFO; diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c index 5493d07d10..3eff1882e7 100644 --- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c +++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c @@ -176,7 +176,7 @@ Ip4ConfigOnDhcp4Complete ( EFI_DHCP4_MODE_DATA Dhcp4Mode; EFI_IP4_IPCONFIG_DATA *Ip4Config; EFI_STATUS Status; - BOOLEAN Perment; + BOOLEAN Permanent; IP4_ADDR Subnet; IP4_ADDR Ip1; IP4_ADDR Ip2; @@ -202,11 +202,11 @@ Ip4ConfigOnDhcp4Complete ( // the instance and to NVRam. So, both the IP4 driver and // other user can get that address. // - Perment = FALSE; + Permanent = FALSE; if (Instance->NicConfig != NULL) { ASSERT (Instance->NicConfig->Source == IP4_CONFIG_SOURCE_DHCP); - Perment = Instance->NicConfig->Perment; + Permanent = Instance->NicConfig->Permanent; FreePool (Instance->NicConfig); } @@ -221,7 +221,7 @@ Ip4ConfigOnDhcp4Complete ( CopyMem (&Instance->NicConfig->NicAddr, &Instance->NicAddr, sizeof (Instance->NicConfig->NicAddr)); Instance->NicConfig->Source = IP4_CONFIG_SOURCE_DHCP; - Instance->NicConfig->Perment = Perment; + Instance->NicConfig->Permanent = Permanent; Ip4Config = &Instance->NicConfig->Ip4Info; Ip4Config->StationAddress = Dhcp4Mode.ClientAddress; diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c index 790e44be4c..56cce6e6f0 100644 --- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c +++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c @@ -319,7 +319,7 @@ Ip4ConfigDriverBindingStart ( // NicConfig = Ip4ConfigReadVariable (Instance); if (NicConfig != NULL) { - if (!NicConfig->Perment) { + if (!NicConfig->Permanent) { // // Delete the non-permanent configuration. // diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c index f09bd51744..89e1ddaf39 100644 --- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c +++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c @@ -271,7 +271,7 @@ Ip4ConfigConvertIfrNvDataToDeviceConfigData ( ZeroMem (&Ip4ConfigInstance->Ip4ConfigCallbackInfo.Gateway, sizeof (EFI_IPv4_ADDRESS)); } - NicInfo->Perment = TRUE; + NicInfo->Permanent = TRUE; CopyMem (&NicInfo->NicAddr, &Ip4ConfigInstance->NicAddr, sizeof (NIC_ADDR)); return EfiNicIp4ConfigSetInfo (Ip4ConfigInstance, NicInfo, TRUE); diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c index 07f2b6cfc2..15cda8cf69 100644 --- a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c @@ -612,7 +612,7 @@ EfiPxeBcDiscover ( if (Index != Info->IpCnt) { // // It's invalid if the first server doesn't accecpt any response - // and meanwhile any of the rest servers accept any reponse. + // but any of the other servers does accept any response. // Status = EFI_INVALID_PARAMETER; goto ON_EXIT; diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c b/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c index 32a4f7fb43..5573e74238 100644 --- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c +++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c @@ -1249,7 +1249,7 @@ IfconfigSetNicAddr ( if (StringNoCaseCompare(&Temp, &DhcpTemp) == 0) { // - // Validate the parameter for DHCP, two valid forms: eth0 DHCP and eth0 DHCP perment + // Validate the parameter for DHCP, two valid forms: eth0 DHCP and eth0 DHCP permanent // if ((Argc != 2) && (Argc!= 3)) { ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellNetwork1HiiHandle, Temp); @@ -1274,7 +1274,7 @@ IfconfigSetNicAddr ( } if ((OldConfig != NULL) && (OldConfig->Source == IP4_CONFIG_SOURCE_DHCP) && - (OldConfig->Perment == Permanent)) { + (OldConfig->Permanent == Permanent)) { ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_IFCONFIG_INTERFACE_CONFIGURED), gShellNetwork1HiiHandle, Info->Name); ShellStatus = SHELL_ALREADY_STARTED; @@ -1285,7 +1285,7 @@ IfconfigSetNicAddr ( } else if (StringNoCaseCompare(&Temp, &StaticTemp) == 0) { // // validate the parameter, two forms: eth0 static IP NETMASK GATEWAY and - // eth0 static IP NETMASK GATEWAY perment + // eth0 static IP NETMASK GATEWAY permanent // if ((Argc != 5) && (Argc != 6)) { ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellNetwork1HiiHandle, Temp); @@ -1716,8 +1716,8 @@ ShellCommandRunIfconfig ( // // The correct command line arguments for setting address are: - // IfConfig -s eth0 DHCP [perment] - // IfConfig -s eth0 static ip netmask gateway [perment] + // IfConfig -s eth0 DHCP [permanent] + // IfConfig -s eth0 static ip netmask gateway [permanent] // if (Item == NULL || (CountSubItems(Item) < 2) || (CountSubItems(Item) > 6) || (CountSubItems(Item) == 4)) { ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellNetwork1HiiHandle, L"-s"); -- 2.39.2