UEFI HII: Merge UEFI HII support changes from branch.

[mirror_edk2.git] / MdeModulePkg / Universal / iScsi / IScsiDhcp.c

diff --git a/MdeModulePkg/Universal/iScsi/IScsiDhcp.c b/MdeModulePkg/Universal/iScsi/IScsiDhcp.c
index 145483b0e748f7d96047e50bd7d441ac45f1cbd7..b9b8cea8abcef62ce95402f223ae6f1faf71e3f4 100644 (file)
--- a/MdeModulePkg/Universal/iScsi/IScsiDhcp.c
+++ b/MdeModulePkg/Universal/iScsi/IScsiDhcp.c
@@ -230,9 +230,9 @@ Returns:
 \r
   Status      = This->Parse (This, Packet, &OptionCount, NULL);\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
-    return EFI_NOT_READY;\r
+    \rreturn EFI_NOT_READY;\r
   }\r
-  \r
+\r
   OptionList = NetAllocatePool (OptionCount * sizeof (EFI_DHCP4_PACKET_OPTION *));\r
   if (OptionList == NULL) {\r
     return EFI_NOT_READY;\r
@@ -437,7 +437,7 @@ Returns:
   // Ask the server to reply with Netmask, Router, DNS and RootPath options.\r
   //\r
   ParaList->OpCode  = DHCP4_TAG_PARA_LIST;\r
-  ParaList->Length  = (UINT8)(ConfigData->NvData.TargetInfoFromDhcp ? 4 : 3);\r
+  ParaList->Length  = ConfigData->NvData.TargetInfoFromDhcp ? 4 : 3;\r
   ParaList->Data[0] = DHCP4_TAG_NETMASK;\r
   ParaList->Data[1] = DHCP4_TAG_ROUTER;\r
   ParaList->Data[2] = DHCP4_TAG_DNS;\r