ShellPkg: Remove trailing white space

[mirror_edk2.git] / ShellPkg / Library / UefiShellNetwork1CommandsLib / Ifconfig.c

diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c b/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c
index 082ab72fed9c4b2797b58983b311a12a01123bae..cdc6db69c34e0372b18ee74e98eb907f12990679 100644 (file)
--- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c
+++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c
@@ -2,7 +2,7 @@
   The implementation for Shell command ifconfig based on IP4Config2 protocol.\r
 \r
   (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>\r
   The implementation for Shell command ifconfig based on IP4Config2 protocol.\r
 \r
   (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>\r

-  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r

 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r


@@ -45,7 +45,7 @@ typedef struct _IFCONFIG_INTERFACE_CB {
   EFI_HANDLE                                  NicHandle;\r
   LIST_ENTRY                                  Link;\r
   EFI_IP4_CONFIG2_PROTOCOL                    *IfCfg;\r
   EFI_HANDLE                                  NicHandle;\r
   LIST_ENTRY                                  Link;\r
   EFI_IP4_CONFIG2_PROTOCOL                    *IfCfg;\r

-  EFI_IP4_CONFIG2_INTERFACE_INFO              *IfInfo; \r
+  EFI_IP4_CONFIG2_INTERFACE_INFO              *IfInfo;\r

   EFI_IP4_CONFIG2_POLICY                      Policy;\r
   UINT32                                      DnsCnt;\r
   EFI_IPv4_ADDRESS                            DnsAddr[1];\r
   EFI_IP4_CONFIG2_POLICY                      Policy;\r
   UINT32                                      DnsCnt;\r
   EFI_IPv4_ADDRESS                            DnsAddr[1];\r


@@ -399,7 +399,7 @@ IfConfigGetInterfaceInfo (
     if (EFI_ERROR (Status)) {\r
       goto ON_ERROR;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       goto ON_ERROR;\r
     }\r

-    \r
+\r

     //\r
     // Get the interface information size.\r
     //\r
     //\r
     // Get the interface information size.\r
     //\r


@@ -420,7 +420,7 @@ IfConfigGetInterfaceInfo (
       Status = EFI_OUT_OF_RESOURCES;\r
       goto ON_ERROR;\r
     }\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto ON_ERROR;\r
     }\r

-    \r
+\r

     //\r
     // Get the interface info.\r
     //\r
     //\r
     // Get the interface info.\r
     //\r


@@ -434,7 +434,7 @@ IfConfigGetInterfaceInfo (
     if (EFI_ERROR (Status)) {\r
       goto ON_ERROR;\r
     }\r
     if (EFI_ERROR (Status)) {\r
       goto ON_ERROR;\r
     }\r

-    \r
+\r

     //\r
     // Check the interface name if required.\r
     //\r
     //\r
     // Check the interface name if required.\r
     //\r


@@ -444,7 +444,7 @@ IfConfigGetInterfaceInfo (
     }\r
 \r
     DataSize = 0;\r
     }\r
 \r
     DataSize = 0;\r

-    \r
+\r

     //\r
     // Get the size of dns server list.\r
     //\r
     //\r
     // Get the size of dns server list.\r
     //\r


@@ -550,11 +550,11 @@ IfConfigShowInterfaceInfo (
   LIST_ENTRY                   *Entry;\r
   LIST_ENTRY                   *Next;\r
   IFCONFIG_INTERFACE_CB        *IfCb;\r
   LIST_ENTRY                   *Entry;\r
   LIST_ENTRY                   *Next;\r
   IFCONFIG_INTERFACE_CB        *IfCb;\r

-  BOOLEAN                       MediaPresent;\r
+  EFI_STATUS                    MediaStatus;\r

   EFI_IPv4_ADDRESS              Gateway;\r
   UINT32                        Index;\r
   EFI_IPv4_ADDRESS              Gateway;\r
   UINT32                        Index;\r

-  \r
-  MediaPresent = TRUE;\r
+\r
+  MediaStatus = EFI_SUCCESS;\r

 \r
   if (IsListEmpty (IfList)) {\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INVALID_INTERFACE), gShellNetwork1HiiHandle);\r
 \r
   if (IsListEmpty (IfList)) {\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INVALID_INTERFACE), gShellNetwork1HiiHandle);\r


@@ -571,13 +571,13 @@ IfConfigShowInterfaceInfo (
     //\r
     // Print interface name.\r
     //\r
     //\r
     // Print interface name.\r
     //\r

-    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_IF_NAME), gShellNetwork1HiiHandle, IfCb->IfInfo->Name); \r
+    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_IF_NAME), gShellNetwork1HiiHandle, IfCb->IfInfo->Name);\r

 \r
     //\r
     // Get Media State.\r
     //\r
 \r
     //\r
     // Get Media State.\r
     //\r

-    if (EFI_SUCCESS == NetLibDetectMedia (IfCb->NicHandle, &MediaPresent)) {\r
-      if (!MediaPresent) {\r
+    if (EFI_SUCCESS == NetLibDetectMediaWaitTimeout (IfCb->NicHandle, 0, &MediaStatus)) {\r
+      if (MediaStatus != EFI_SUCCESS) {\r

         ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_MEDIA_STATE), gShellNetwork1HiiHandle, L"Media disconnected");\r
       } else {\r
         ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_MEDIA_STATE), gShellNetwork1HiiHandle, L"Media present");\r
         ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_MEDIA_STATE), gShellNetwork1HiiHandle, L"Media disconnected");\r
       } else {\r
         ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_MEDIA_STATE), gShellNetwork1HiiHandle, L"Media present");\r


@@ -611,10 +611,10 @@ IfConfigShowInterfaceInfo (
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_IP_ADDR_HEAD), gShellNetwork1HiiHandle);\r
 \r
     ShellPrintHiiEx(\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_IP_ADDR_HEAD), gShellNetwork1HiiHandle);\r
 \r
     ShellPrintHiiEx(\r

-      -1, \r
-      -1, \r
+      -1,\r
+      -1,\r

       NULL,\r
       NULL,\r

-      STRING_TOKEN (STR_IFCONFIG_INFO_IP_ADDR_BODY), \r
+      STRING_TOKEN (STR_IFCONFIG_INFO_IP_ADDR_BODY),\r

       gShellNetwork1HiiHandle,\r
       (UINTN)IfCb->IfInfo->StationAddress.Addr[0],\r
       (UINTN)IfCb->IfInfo->StationAddress.Addr[1],\r
       gShellNetwork1HiiHandle,\r
       (UINTN)IfCb->IfInfo->StationAddress.Addr[0],\r
       (UINTN)IfCb->IfInfo->StationAddress.Addr[1],\r


@@ -628,10 +628,10 @@ IfConfigShowInterfaceInfo (
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_SUBNET_MASK_HEAD), gShellNetwork1HiiHandle);\r
 \r
     ShellPrintHiiEx(\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_SUBNET_MASK_HEAD), gShellNetwork1HiiHandle);\r
 \r
     ShellPrintHiiEx(\r

-      -1, \r
-      -1, \r
+      -1,\r
+      -1,\r

       NULL,\r
       NULL,\r

-      STRING_TOKEN (STR_IFCONFIG_INFO_IP_ADDR_BODY), \r
+      STRING_TOKEN (STR_IFCONFIG_INFO_IP_ADDR_BODY),\r

       gShellNetwork1HiiHandle,\r
       (UINTN)IfCb->IfInfo->SubnetMask.Addr[0],\r
       (UINTN)IfCb->IfInfo->SubnetMask.Addr[1],\r
       gShellNetwork1HiiHandle,\r
       (UINTN)IfCb->IfInfo->SubnetMask.Addr[0],\r
       (UINTN)IfCb->IfInfo->SubnetMask.Addr[1],\r


@@ -645,26 +645,26 @@ IfConfigShowInterfaceInfo (
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_GATEWAY_HEAD), gShellNetwork1HiiHandle);\r
 \r
     ZeroMem (&Gateway, sizeof (EFI_IPv4_ADDRESS));\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_GATEWAY_HEAD), gShellNetwork1HiiHandle);\r
 \r
     ZeroMem (&Gateway, sizeof (EFI_IPv4_ADDRESS));\r

-    \r
+\r

     for (Index = 0; Index < IfCb->IfInfo->RouteTableSize; Index++) {\r
       if ((CompareMem (&IfCb->IfInfo->RouteTable[Index].SubnetAddress, &mZeroIp4Addr, sizeof (EFI_IPv4_ADDRESS)) == 0) &&\r
           (CompareMem (&IfCb->IfInfo->RouteTable[Index].SubnetMask   , &mZeroIp4Addr, sizeof (EFI_IPv4_ADDRESS)) == 0) ){\r
         CopyMem (&Gateway, &IfCb->IfInfo->RouteTable[Index].GatewayAddress, sizeof (EFI_IPv4_ADDRESS));\r
       }\r
     for (Index = 0; Index < IfCb->IfInfo->RouteTableSize; Index++) {\r
       if ((CompareMem (&IfCb->IfInfo->RouteTable[Index].SubnetAddress, &mZeroIp4Addr, sizeof (EFI_IPv4_ADDRESS)) == 0) &&\r
           (CompareMem (&IfCb->IfInfo->RouteTable[Index].SubnetMask   , &mZeroIp4Addr, sizeof (EFI_IPv4_ADDRESS)) == 0) ){\r
         CopyMem (&Gateway, &IfCb->IfInfo->RouteTable[Index].GatewayAddress, sizeof (EFI_IPv4_ADDRESS));\r
       }\r

-    }    \r
+    }\r

 \r
     ShellPrintHiiEx(\r
 \r
     ShellPrintHiiEx(\r

-      -1, \r
-      -1, \r
+      -1,\r
+      -1,\r

       NULL,\r
       NULL,\r

-      STRING_TOKEN (STR_IFCONFIG_INFO_IP_ADDR_BODY), \r
+      STRING_TOKEN (STR_IFCONFIG_INFO_IP_ADDR_BODY),\r

       gShellNetwork1HiiHandle,\r
       (UINTN)Gateway.Addr[0],\r
       (UINTN)Gateway.Addr[1],\r
       (UINTN)Gateway.Addr[2],\r
       (UINTN)Gateway.Addr[3]\r
       );\r
       gShellNetwork1HiiHandle,\r
       (UINTN)Gateway.Addr[0],\r
       (UINTN)Gateway.Addr[1],\r
       (UINTN)Gateway.Addr[2],\r
       (UINTN)Gateway.Addr[3]\r
       );\r

-      \r
+\r

     //\r
     // Print route table entry.\r
     //\r
     //\r
     // Print route table entry.\r
     //\r


@@ -674,11 +674,11 @@ IfConfigShowInterfaceInfo (
       ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_IFCONFIG_ROUTES_ENTRY_INDEX), gShellNetwork1HiiHandle, Index);\r
 \r
       ShellPrintHiiEx(\r
       ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_IFCONFIG_ROUTES_ENTRY_INDEX), gShellNetwork1HiiHandle, Index);\r
 \r
       ShellPrintHiiEx(\r

-        -1, \r
-        -1, \r
+        -1,\r
+        -1,\r

         NULL,\r
         NULL,\r

-        STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR), \r
-        gShellNetwork1HiiHandle, \r
+        STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR),\r
+        gShellNetwork1HiiHandle,\r

         L"Subnet ",\r
         (UINTN)IfCb->IfInfo->RouteTable[Index].SubnetAddress.Addr[0],\r
         (UINTN)IfCb->IfInfo->RouteTable[Index].SubnetAddress.Addr[1],\r
         L"Subnet ",\r
         (UINTN)IfCb->IfInfo->RouteTable[Index].SubnetAddress.Addr[0],\r
         (UINTN)IfCb->IfInfo->RouteTable[Index].SubnetAddress.Addr[1],\r


@@ -687,11 +687,11 @@ IfConfigShowInterfaceInfo (
         );\r
 \r
       ShellPrintHiiEx(\r
         );\r
 \r
       ShellPrintHiiEx(\r

-        -1, \r
-        -1, \r
+        -1,\r
+        -1,\r

         NULL,\r
         NULL,\r

-        STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR), \r
-        gShellNetwork1HiiHandle, \r
+        STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR),\r
+        gShellNetwork1HiiHandle,\r

         L"Netmask",\r
         (UINTN)IfCb->IfInfo->RouteTable[Index].SubnetMask.Addr[0],\r
         (UINTN)IfCb->IfInfo->RouteTable[Index].SubnetMask.Addr[1],\r
         L"Netmask",\r
         (UINTN)IfCb->IfInfo->RouteTable[Index].SubnetMask.Addr[0],\r
         (UINTN)IfCb->IfInfo->RouteTable[Index].SubnetMask.Addr[1],\r


@@ -700,11 +700,11 @@ IfConfigShowInterfaceInfo (
         );\r
 \r
       ShellPrintHiiEx(\r
         );\r
 \r
       ShellPrintHiiEx(\r

-        -1, \r
-        -1, \r
+        -1,\r
+        -1,\r

         NULL,\r
         NULL,\r

-        STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR), \r
-        gShellNetwork1HiiHandle, \r
+        STRING_TOKEN (STR_IFCONFIG_SHOW_IP_ADDR),\r
+        gShellNetwork1HiiHandle,\r

         L"Gateway",\r
         (UINTN)IfCb->IfInfo->RouteTable[Index].GatewayAddress.Addr[0],\r
         (UINTN)IfCb->IfInfo->RouteTable[Index].GatewayAddress.Addr[1],\r
         L"Gateway",\r
         (UINTN)IfCb->IfInfo->RouteTable[Index].GatewayAddress.Addr[0],\r
         (UINTN)IfCb->IfInfo->RouteTable[Index].GatewayAddress.Addr[1],\r


@@ -720,10 +720,10 @@ IfConfigShowInterfaceInfo (
 \r
     for (Index = 0; Index < IfCb->DnsCnt; Index++) {\r
       ShellPrintHiiEx(\r
 \r
     for (Index = 0; Index < IfCb->DnsCnt; Index++) {\r
       ShellPrintHiiEx(\r

-        -1, \r
-        -1, \r
+        -1,\r
+        -1,\r

         NULL,\r
         NULL,\r

-        STRING_TOKEN (STR_IFCONFIG_INFO_DNS_ADDR_BODY), \r
+        STRING_TOKEN (STR_IFCONFIG_INFO_DNS_ADDR_BODY),\r

         gShellNetwork1HiiHandle,\r
         (UINTN) IfCb->DnsAddr[Index].Addr[0],\r
         (UINTN) IfCb->DnsAddr[Index].Addr[1],\r
         gShellNetwork1HiiHandle,\r
         (UINTN) IfCb->DnsAddr[Index].Addr[0],\r
         (UINTN) IfCb->DnsAddr[Index].Addr[1],\r


@@ -734,7 +734,7 @@ IfConfigShowInterfaceInfo (
       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_NEWLINE), gShellNetwork1HiiHandle);\r
     }\r
   }\r
       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_NEWLINE), gShellNetwork1HiiHandle);\r
     }\r
   }\r

-  \r
+\r

   ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_BREAK), gShellNetwork1HiiHandle);\r
 \r
   return SHELL_SUCCESS;\r
   ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_BREAK), gShellNetwork1HiiHandle);\r
 \r
   return SHELL_SUCCESS;\r


@@ -756,13 +756,13 @@ IfConfigClearInterfaceInfo (
   IN CHAR16        *IfName\r
   )\r
 {\r
   IN CHAR16        *IfName\r
   )\r
 {\r

-  EFI_STATUS                Status;  \r
+  EFI_STATUS                Status;\r

   SHELL_STATUS              ShellStatus;\r
   LIST_ENTRY                *Entry;\r
   LIST_ENTRY                *Next;\r
   IFCONFIG_INTERFACE_CB     *IfCb;\r
   EFI_IP4_CONFIG2_POLICY    Policy;\r
   SHELL_STATUS              ShellStatus;\r
   LIST_ENTRY                *Entry;\r
   LIST_ENTRY                *Next;\r
   IFCONFIG_INTERFACE_CB     *IfCb;\r
   EFI_IP4_CONFIG2_POLICY    Policy;\r

-  \r
+\r

   Status = EFI_SUCCESS;\r
   ShellStatus = SHELL_SUCCESS;\r
 \r
   Status = EFI_SUCCESS;\r
   ShellStatus = SHELL_SUCCESS;\r
 \r


@@ -772,7 +772,7 @@ IfConfigClearInterfaceInfo (
 \r
   //\r
   // Go through the interface list.\r
 \r
   //\r
   // Go through the interface list.\r

-  // If the interface name is specified, DHCP DORA process will be \r
+  // If the interface name is specified, DHCP DORA process will be\r

   // triggered by the policy transition (static -> dhcp).\r
   //\r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, IfList) {\r
   // triggered by the policy transition (static -> dhcp).\r
   //\r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, IfList) {\r


@@ -780,7 +780,7 @@ IfConfigClearInterfaceInfo (
 \r
     if ((IfName != NULL) && (StrCmp (IfName, IfCb->IfInfo->Name) == 0)) {\r
       Policy = Ip4Config2PolicyStatic;\r
 \r
     if ((IfName != NULL) && (StrCmp (IfName, IfCb->IfInfo->Name) == 0)) {\r
       Policy = Ip4Config2PolicyStatic;\r

-      \r
+\r

       Status = IfCb->IfCfg->SetData (\r
                               IfCb->IfCfg,\r
                               Ip4Config2DataTypePolicy,\r
       Status = IfCb->IfCfg->SetData (\r
                               IfCb->IfCfg,\r
                               Ip4Config2DataTypePolicy,\r


@@ -791,11 +791,11 @@ IfConfigClearInterfaceInfo (
         ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellNetwork1HiiHandle, L"ifconfig");\r
         ShellStatus = SHELL_ACCESS_DENIED;\r
         break;\r
         ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellNetwork1HiiHandle, L"ifconfig");\r
         ShellStatus = SHELL_ACCESS_DENIED;\r
         break;\r

-      }  \r
+      }\r

     }\r
 \r
     Policy = Ip4Config2PolicyDhcp;\r
     }\r
 \r
     Policy = Ip4Config2PolicyDhcp;\r

-    \r
+\r

     Status = IfCb->IfCfg->SetData (\r
                             IfCb->IfCfg,\r
                             Ip4Config2DataTypePolicy,\r
     Status = IfCb->IfCfg->SetData (\r
                             IfCb->IfCfg,\r
                             Ip4Config2DataTypePolicy,\r


@@ -854,7 +854,7 @@ IfConfigSetInterfaceInfo (
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INVALID_INTERFACE), gShellNetwork1HiiHandle);\r
     return SHELL_INVALID_PARAMETER;\r
   }\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INVALID_INTERFACE), gShellNetwork1HiiHandle);\r
     return SHELL_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   //\r
   // Make sure to set only one interface each time.\r
   //\r
   //\r
   // Make sure to set only one interface each time.\r
   //\r


@@ -944,7 +944,7 @@ IfConfigSetInterfaceInfo (
       }\r
 \r
       VarArg = VarArg->Next;\r
       }\r
 \r
       VarArg = VarArg->Next;\r

-      continue;   \r
+      continue;\r

     }\r
 \r
     //\r
     }\r
 \r
     //\r


@@ -966,8 +966,8 @@ IfConfigSetInterfaceInfo (
         ShellStatus = SHELL_ACCESS_DENIED;\r
         goto ON_EXIT;\r
       }\r
         ShellStatus = SHELL_ACCESS_DENIED;\r
         goto ON_EXIT;\r
       }\r

-      \r
-      VarArg= VarArg->Next;    \r
+\r
+      VarArg= VarArg->Next;\r

 \r
     } else if (StrCmp (VarArg->Arg, L"static") == 0) {\r
       VarArg= VarArg->Next;\r
 \r
     } else if (StrCmp (VarArg->Arg, L"static") == 0) {\r
       VarArg= VarArg->Next;\r


@@ -978,7 +978,7 @@ IfConfigSetInterfaceInfo (
       }\r
 \r
       ZeroMem (&ManualAddress, sizeof (ManualAddress));\r
       }\r
 \r
       ZeroMem (&ManualAddress, sizeof (ManualAddress));\r

-    \r
+\r

       //\r
       // Get manual IP address.\r
       //\r
       //\r
       // Get manual IP address.\r
       //\r


@@ -991,14 +991,14 @@ IfConfigSetInterfaceInfo (
 \r
       //\r
       // Get subnetmask.\r
 \r
       //\r
       // Get subnetmask.\r

-      //    \r
+      //\r

       VarArg = VarArg->Next;\r
       if (VarArg == NULL) {\r
         ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_LACK_COMMAND), gShellNetwork1HiiHandle);\r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
         goto ON_EXIT;\r
       }\r
       VarArg = VarArg->Next;\r
       if (VarArg == NULL) {\r
         ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_LACK_COMMAND), gShellNetwork1HiiHandle);\r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
         goto ON_EXIT;\r
       }\r

-      \r
+\r

       Status = NetLibStrToIp4 (VarArg->Arg, &ManualAddress.SubnetMask);\r
       if (EFI_ERROR(Status)) {\r
         ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_IFCONFIG_INVALID_IPADDRESS), gShellNetwork1HiiHandle, VarArg->Arg);\r
       Status = NetLibStrToIp4 (VarArg->Arg, &ManualAddress.SubnetMask);\r
       if (EFI_ERROR(Status)) {\r
         ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_IFCONFIG_INVALID_IPADDRESS), gShellNetwork1HiiHandle, VarArg->Arg);\r


@@ -1015,7 +1015,7 @@ IfConfigSetInterfaceInfo (
         ShellStatus = SHELL_INVALID_PARAMETER;\r
         goto ON_EXIT;\r
       }\r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
         goto ON_EXIT;\r
       }\r

-      \r
+\r

       Status = NetLibStrToIp4 (VarArg->Arg, &Gateway);\r
       if (EFI_ERROR(Status)) {\r
         ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_IFCONFIG_INVALID_IPADDRESS), gShellNetwork1HiiHandle, VarArg->Arg);\r
       Status = NetLibStrToIp4 (VarArg->Arg, &Gateway);\r
       if (EFI_ERROR(Status)) {\r
         ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_IFCONFIG_INVALID_IPADDRESS), gShellNetwork1HiiHandle, VarArg->Arg);\r


@@ -1032,6 +1032,7 @@ IfConfigSetInterfaceInfo (
       SubnetMask  = NTOHL (SubnetMask);\r
       TempGateway = NTOHL (TempGateway);\r
       if ((SubnetMask != 0) &&\r
       SubnetMask  = NTOHL (SubnetMask);\r
       TempGateway = NTOHL (TempGateway);\r
       if ((SubnetMask != 0) &&\r

+          (SubnetMask != 0xFFFFFFFFu) &&\r

           !NetIp4IsUnicast (TempGateway, SubnetMask)) {\r
         ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INVALID_GATEWAY), gShellNetwork1HiiHandle, VarArg->Arg);\r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
           !NetIp4IsUnicast (TempGateway, SubnetMask)) {\r
         ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INVALID_GATEWAY), gShellNetwork1HiiHandle, VarArg->Arg);\r
         ShellStatus = SHELL_INVALID_PARAMETER;\r


@@ -1053,7 +1054,7 @@ IfConfigSetInterfaceInfo (
         ShellStatus = SHELL_ACCESS_DENIED;\r
         goto ON_EXIT;\r
       }\r
         ShellStatus = SHELL_ACCESS_DENIED;\r
         goto ON_EXIT;\r
       }\r

-      \r
+\r

       //\r
       // Set Manual Address.\r
       //\r
       //\r
       // Set Manual Address.\r
       //\r


@@ -1095,7 +1096,7 @@ IfConfigSetInterfaceInfo (
                      Ip4Config2DataTypeManualAddress,\r
                      MappedEvt\r
                      );\r
                      Ip4Config2DataTypeManualAddress,\r
                      MappedEvt\r
                      );\r

-      \r
+\r

       if (EFI_ERROR (Status)) {\r
         ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_SET_ADDR_FAILED), gShellNetwork1HiiHandle, Status);\r
         ShellStatus = SHELL_ACCESS_DENIED;\r
       if (EFI_ERROR (Status)) {\r
         ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_SET_ADDR_FAILED), gShellNetwork1HiiHandle, Status);\r
         ShellStatus = SHELL_ACCESS_DENIED;\r


@@ -1118,9 +1119,9 @@ IfConfigSetInterfaceInfo (
         ShellStatus = SHELL_ACCESS_DENIED;\r
         goto ON_EXIT;\r
       }\r
         ShellStatus = SHELL_ACCESS_DENIED;\r
         goto ON_EXIT;\r
       }\r

-      \r
+\r

       VarArg = VarArg->Next;\r
       VarArg = VarArg->Next;\r

-      \r
+\r

     } else if (StrCmp (VarArg->Arg, L"dns") == 0) {\r
       //\r
       // Get DNS addresses.\r
     } else if (StrCmp (VarArg->Arg, L"dns") == 0) {\r
       //\r
       // Get DNS addresses.\r


@@ -1151,7 +1152,7 @@ IfConfigSetInterfaceInfo (
         Index ++;\r
         Tmp = Tmp->Next;\r
       }\r
         Index ++;\r
         Tmp = Tmp->Next;\r
       }\r

-      \r
+\r

       VarArg = Tmp;\r
 \r
       //\r
       VarArg = Tmp;\r
 \r
       //\r


@@ -1177,7 +1178,7 @@ ON_EXIT:
   if (Dns != NULL) {\r
     FreePool (Dns);\r
   }\r
   if (Dns != NULL) {\r
     FreePool (Dns);\r
   }\r

-  \r
+\r

   return ShellStatus;\r
 \r
 }\r
   return ShellStatus;\r
 \r
 }\r


@@ -1209,7 +1210,7 @@ IfConfig (
              &Private->IfList\r
              );\r
   if (EFI_ERROR (Status)) {\r
              &Private->IfList\r
              );\r
   if (EFI_ERROR (Status)) {\r

-    ShellStatus = SHELL_NOT_FOUND; \r
+    ShellStatus = SHELL_NOT_FOUND;\r

     goto ON_EXIT;\r
   }\r
 \r
     goto ON_EXIT;\r
   }\r
 \r


@@ -1289,7 +1290,7 @@ IfConfigCleanup (
 \r
   @retval EFI_SUCCESS    ifconfig command processed successfully.\r
   @retval others         The ifconfig command process failed.\r
 \r
   @retval EFI_SUCCESS    ifconfig command processed successfully.\r
   @retval others         The ifconfig command process failed.\r

-  \r
+\r

 **/\r
 SHELL_STATUS\r
 EFIAPI\r
 **/\r
 SHELL_STATUS\r
 EFIAPI\r


@@ -1306,7 +1307,7 @@ ShellCommandRunIfconfig (
   ARG_LIST                  *ArgList;\r
   CHAR16                    *ProblemParam;\r
   CHAR16                    *Str;\r
   ARG_LIST                  *ArgList;\r
   CHAR16                    *ProblemParam;\r
   CHAR16                    *Str;\r

-  \r
+\r

   Status = EFI_INVALID_PARAMETER;\r
   Private = NULL;\r
   ShellStatus = SHELL_SUCCESS;\r
   Status = EFI_INVALID_PARAMETER;\r
   Private = NULL;\r
   ShellStatus = SHELL_SUCCESS;\r


@@ -1320,7 +1321,7 @@ ShellCommandRunIfconfig (
     } else {\r
       ASSERT(FALSE);\r
     }\r
     } else {\r
       ASSERT(FALSE);\r
     }\r

-    \r
+\r

     goto ON_EXIT;\r
   }\r
 \r
     goto ON_EXIT;\r
   }\r
 \r


@@ -1395,7 +1396,7 @@ ShellCommandRunIfconfig (
       Private->IfName = Str;\r
     }\r
   }\r
       Private->IfName = Str;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // To get interface name and corresponding Args for the set option.\r
   //\r
   //\r
   // To get interface name and corresponding Args for the set option.\r
   //\r


@@ -1406,7 +1407,7 @@ ShellCommandRunIfconfig (
       ShellStatus = SHELL_INVALID_PARAMETER;\r
       goto ON_EXIT;\r
     }\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
       goto ON_EXIT;\r
     }\r

-    \r
+\r

     //\r
     // To split the configuration into multi-section.\r
     //\r
     //\r
     // To split the configuration into multi-section.\r
     //\r


@@ -1428,7 +1429,7 @@ ShellCommandRunIfconfig (
       goto ON_EXIT;\r
     }\r
   }\r
       goto ON_EXIT;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // Main process of ifconfig.\r
   //\r
   //\r
   // Main process of ifconfig.\r
   //\r


@@ -1437,7 +1438,7 @@ ShellCommandRunIfconfig (
 ON_EXIT:\r
 \r
   ShellCommandLineFreeVarList (ParamPackage);\r
 ON_EXIT:\r
 \r
   ShellCommandLineFreeVarList (ParamPackage);\r

-  \r
+\r

   if (Private != NULL) {\r
     IfConfigCleanup (Private);\r
   }\r
   if (Private != NULL) {\r
     IfConfigCleanup (Private);\r
   }\r