tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-31 01:24:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix spelling typo in the NIC_IP4_CONFIG_INFO.Permanent variable name, which was incorrectly called NIC_IP4_CONFIG_INFO.Perment

Browse Source 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Samer El-Haj-Mahmoud elhaj@hp.com 
Reviewed-by: Jaben Carsey <Jaben.carsey@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14743 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Samer El-Haj-Mahmoud elhaj 2013-10-01 22:12:51 +00:00 committed by jcarsey
parent 43e54972af
commit 928927dd8e
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MdeModulePkg/Include/Guid/NicIp4ConfigNvData.h
View File

@ -61,7 +61,7 @@ typedef struct {
typedef struct { typedef struct {
NIC_ADDR NicAddr; ///< Link layer address to identify the NIC. NIC_ADDR NicAddr; ///< Link layer address to identify the NIC.
UINT32 Source; ///< Static or DHCP. 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. EFI_IP4_IPCONFIG_DATA Ip4Info; ///< IP addresses.
} NIC_IP4_CONFIG_INFO; } NIC_IP4_CONFIG_INFO;

8
MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
View File

@ -176,7 +176,7 @@ Ip4ConfigOnDhcp4Complete (
EFI_DHCP4_MODE_DATA Dhcp4Mode; EFI_DHCP4_MODE_DATA Dhcp4Mode;
EFI_IP4_IPCONFIG_DATA *Ip4Config; EFI_IP4_IPCONFIG_DATA *Ip4Config;
EFI_STATUS Status; EFI_STATUS Status;
BOOLEAN Perment; BOOLEAN Permanent;
IP4_ADDR Subnet; IP4_ADDR Subnet;
IP4_ADDR Ip1; IP4_ADDR Ip1;
IP4_ADDR Ip2; IP4_ADDR Ip2;
@ -202,11 +202,11 @@ Ip4ConfigOnDhcp4Complete (
// the instance and to NVRam. So, both the IP4 driver and // the instance and to NVRam. So, both the IP4 driver and
// other user can get that address. // other user can get that address.
// //
Perment = FALSE; Permanent = FALSE;
if (Instance->NicConfig != NULL) { if (Instance->NicConfig != NULL) {
ASSERT (Instance->NicConfig->Source == IP4_CONFIG_SOURCE_DHCP); ASSERT (Instance->NicConfig->Source == IP4_CONFIG_SOURCE_DHCP);
Perment = Instance->NicConfig->Perment; Permanent = Instance->NicConfig->Permanent;
FreePool (Instance->NicConfig); FreePool (Instance->NicConfig);
} }
@ -221,7 +221,7 @@ Ip4ConfigOnDhcp4Complete (
CopyMem (&Instance->NicConfig->NicAddr, &Instance->NicAddr, sizeof (Instance->NicConfig->NicAddr)); CopyMem (&Instance->NicConfig->NicAddr, &Instance->NicAddr, sizeof (Instance->NicConfig->NicAddr));
Instance->NicConfig->Source = IP4_CONFIG_SOURCE_DHCP; Instance->NicConfig->Source = IP4_CONFIG_SOURCE_DHCP;
Instance->NicConfig->Perment = Perment; Instance->NicConfig->Permanent = Permanent;
Ip4Config = &Instance->NicConfig->Ip4Info; Ip4Config = &Instance->NicConfig->Ip4Info;
Ip4Config->StationAddress = Dhcp4Mode.ClientAddress; Ip4Config->StationAddress = Dhcp4Mode.ClientAddress;

2
MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
View File

@ -319,7 +319,7 @@ Ip4ConfigDriverBindingStart (
// //
NicConfig = Ip4ConfigReadVariable (Instance); NicConfig = Ip4ConfigReadVariable (Instance);
if (NicConfig != NULL) { if (NicConfig != NULL) {
if (!NicConfig->Perment) { if (!NicConfig->Permanent) {
// //
// Delete the non-permanent configuration. // Delete the non-permanent configuration.
// //

2
MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
View File

@ -271,7 +271,7 @@ Ip4ConfigConvertIfrNvDataToDeviceConfigData (
ZeroMem (&Ip4ConfigInstance->Ip4ConfigCallbackInfo.Gateway, sizeof (EFI_IPv4_ADDRESS)); ZeroMem (&Ip4ConfigInstance->Ip4ConfigCallbackInfo.Gateway, sizeof (EFI_IPv4_ADDRESS));
} }
NicInfo->Perment = TRUE; NicInfo->Permanent = TRUE;
CopyMem (&NicInfo->NicAddr, &Ip4ConfigInstance->NicAddr, sizeof (NIC_ADDR)); CopyMem (&NicInfo->NicAddr, &Ip4ConfigInstance->NicAddr, sizeof (NIC_ADDR));
return EfiNicIp4ConfigSetInfo (Ip4ConfigInstance, NicInfo, TRUE); return EfiNicIp4ConfigSetInfo (Ip4ConfigInstance, NicInfo, TRUE);

2
NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
View File

@ -612,7 +612,7 @@ EfiPxeBcDiscover (
if (Index != Info->IpCnt) { if (Index != Info->IpCnt) {
// //
// It's invalid if the first server doesn't accecpt any response // 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; Status = EFI_INVALID_PARAMETER;
goto ON_EXIT; goto ON_EXIT;

10
ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c
View File

@ -1249,7 +1249,7 @@ IfconfigSetNicAddr (
if (StringNoCaseCompare(&Temp, &DhcpTemp) == 0) { 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)) { if ((Argc != 2) && (Argc!= 3)) {
ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellNetwork1HiiHandle, Temp); 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) && 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); ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_IFCONFIG_INTERFACE_CONFIGURED), gShellNetwork1HiiHandle, Info->Name);
ShellStatus = SHELL_ALREADY_STARTED; ShellStatus = SHELL_ALREADY_STARTED;
@ -1285,7 +1285,7 @@ IfconfigSetNicAddr (
} else if (StringNoCaseCompare(&Temp, &StaticTemp) == 0) { } else if (StringNoCaseCompare(&Temp, &StaticTemp) == 0) {
// //
// validate the parameter, two forms: eth0 static IP NETMASK GATEWAY and // 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)) { if ((Argc != 5) && (Argc != 6)) {
ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellNetwork1HiiHandle, Temp); 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: // The correct command line arguments for setting address are:
// IfConfig -s eth0 DHCP [perment] // IfConfig -s eth0 DHCP [permanent]
// IfConfig -s eth0 static ip netmask gateway [perment] // IfConfig -s eth0 static ip netmask gateway [permanent]
// //
if (Item == NULL || (CountSubItems(Item) < 2) || (CountSubItems(Item) > 6) || (CountSubItems(Item) == 4)) { 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"); ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellNetwork1HiiHandle, L"-s");