Code clean up in NetLib:

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Ip4Dxe / Ip4Impl.c

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
index 0b570e25947fc09cd36e1c51c0ef6728d90eee66..05fd96d634cd98c2badf90b214265316fe543c65 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
@@ -561,6 +561,10 @@ Ip4AutoConfigCallBackDpc (
   EFI_STATUS                Status;\r
   UINTN                     Len;\r
   UINT32                    Index;\r
+  IP4_ADDR                  StationAddress;\r
+  IP4_ADDR                  SubnetMask;\r
+  IP4_ADDR                  SubnetAddress;\r
+  IP4_ADDR                  GatewayAddress;\r
 \r
   IpSb      = (IP4_SERVICE *) Context;\r
   NET_CHECK_SIGNATURE (IpSb, IP4_SERVICE_SIGNATURE);\r
@@ -646,11 +650,9 @@ Ip4AutoConfigCallBackDpc (
   // Set the default interface's address, then add a directed\r
   // route for it, that is, the route whose nexthop is zero.\r
   //\r
-  Status = Ip4SetAddress (\r
-             IpIf,\r
-             EFI_NTOHL (Data->StationAddress),\r
-             EFI_NTOHL (Data->SubnetMask)\r
-             );\r
+  StationAddress = EFI_NTOHL (Data->StationAddress);\r
+  SubnetMask = EFI_NTOHL (Data->SubnetMask);\r
+  Status = Ip4SetAddress (IpIf, StationAddress, SubnetMask);\r
 \r
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
@@ -658,8 +660,8 @@ Ip4AutoConfigCallBackDpc (
 \r
   Ip4AddRoute (\r
     IpSb->DefaultRouteTable,\r
-    EFI_NTOHL (Data->StationAddress),\r
-    EFI_NTOHL (Data->SubnetMask),\r
+    StationAddress,\r
+    SubnetMask,\r
     IP4_ALLZERO_ADDRESS\r
     );\r
 \r
@@ -669,12 +671,10 @@ Ip4AutoConfigCallBackDpc (
   for (Index = 0; Index < Data->RouteTableSize; Index++) {\r
     RouteEntry = &Data->RouteTable[Index];\r
 \r
-    Ip4AddRoute (\r
-      IpSb->DefaultRouteTable,\r
-      EFI_NTOHL (RouteEntry->SubnetAddress),\r
-      EFI_NTOHL (RouteEntry->SubnetMask),\r
-      EFI_NTOHL (RouteEntry->GatewayAddress)\r
-      );\r
+    SubnetAddress = EFI_NTOHL (RouteEntry->SubnetAddress);\r
+    SubnetMask = EFI_NTOHL (RouteEntry->SubnetMask);\r
+    GatewayAddress = EFI_NTOHL (RouteEntry->GatewayAddress);\r
+    Ip4AddRoute (IpSb->DefaultRouteTable, SubnetAddress, SubnetMask, GatewayAddress);\r
   }\r
 \r
   IpSb->State = IP4_SERVICE_CONFIGED;\r