1. Mark the network volatile variables as deprecated in code comments and remove...

[mirror_edk2.git] / NetworkPkg / Ip6Dxe / Ip6Driver.c

diff --git a/NetworkPkg/Ip6Dxe/Ip6Driver.c b/NetworkPkg/Ip6Dxe/Ip6Driver.c
index 27550a5b3ed8bbf785e611ccf97f4719963361ac..69587849cc7740137a67539958ac2fdf08d246f8 100644 (file)
--- a/NetworkPkg/Ip6Dxe/Ip6Driver.c
+++ b/NetworkPkg/Ip6Dxe/Ip6Driver.c
@@ -1,7 +1,7 @@
 /** @file\r
   The driver binding and service binding protocol for IP6 driver.\r
 \r
-  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2014, 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
@@ -412,22 +412,21 @@ Ip6CreateService (
     goto ON_ERROR;\r
   }\r
 \r
-  //\r
-  // The timer expires every 100 (IP6_TIMER_INTERVAL_IN_MS) milliseconds.\r
-  //\r
-  Status = gBS->SetTimer (IpSb->FasterTimer, TimerPeriodic, TICKS_PER_MS * IP6_TIMER_INTERVAL_IN_MS);\r
+  Status = NetLibGetMacString (IpSb->Controller, IpSb->Image, &IpSb->MacString);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
   }\r
 \r
-  //\r
-  // The timer expires every 1000 (IP6_ONE_SECOND_IN_MS) milliseconds.\r
-  //\r
-  Status = gBS->SetTimer (IpSb->Timer, TimerPeriodic, TICKS_PER_MS * IP6_ONE_SECOND_IN_MS);\r
+  Status = Ip6ConfigInitInstance (&IpSb->Ip6ConfigInstance);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
   }\r
 \r
+  IpSb->DefaultInterface = Ip6CreateInterface (IpSb, TRUE);\r
+  if (IpSb->DefaultInterface == NULL) {\r
+    Status = EFI_DEVICE_ERROR;\r
+    goto ON_ERROR;\r
+  }\r
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
@@ -440,27 +439,6 @@ Ip6CreateService (
     goto ON_ERROR;\r
   }\r
 \r
-  Status = Ip6ReceiveFrame (Ip6AcceptFrame, IpSb);\r
-  if (EFI_ERROR (Status)) {\r
-    goto ON_ERROR;\r
-  }\r
-\r
-  Status = NetLibGetMacString (IpSb->Controller, IpSb->Image, &IpSb->MacString);\r
-  if (EFI_ERROR (Status)) {\r
-    goto ON_ERROR;\r
-  }\r
-\r
-  Status = Ip6ConfigInitInstance (&IpSb->Ip6ConfigInstance);\r
-  if (EFI_ERROR (Status)) {\r
-    goto ON_ERROR;\r
-  }\r
-\r
-  IpSb->DefaultInterface = Ip6CreateInterface (IpSb, TRUE);\r
-  if (IpSb->DefaultInterface == NULL) {\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto ON_ERROR;\r
-  }\r
-\r
   //\r
   // If there is any manual address, set it.\r
   //\r
@@ -557,19 +535,50 @@ Ip6DriverBindingStart (
                   NULL\r
                   );\r
 \r
-  if (EFI_ERROR (Status)) {\r
+  if (!EFI_ERROR (Status)) {\r
+    //\r
+    // ready to go: start the receiving and timer\r
+    //\r
+    Status = Ip6ReceiveFrame (Ip6AcceptFrame, IpSb);\r
+    if (EFI_ERROR (Status)) {\r
+      goto ON_ERROR;\r
+    }\r
+\r
+    //\r
+    // The timer expires every 100 (IP6_TIMER_INTERVAL_IN_MS) milliseconds.\r
+    //\r
+    Status = gBS->SetTimer (\r
+                    IpSb->FasterTimer,\r
+                    TimerPeriodic,\r
+                    TICKS_PER_MS * IP6_TIMER_INTERVAL_IN_MS\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      goto ON_ERROR;\r
+    }\r
+\r
+    //\r
+    // The timer expires every 1000 (IP6_ONE_SECOND_IN_MS) milliseconds.\r
+    //\r
+    Status = gBS->SetTimer (\r
+                    IpSb->Timer,\r
+                    TimerPeriodic,\r
+                    TICKS_PER_MS * IP6_ONE_SECOND_IN_MS\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      goto ON_ERROR;\r
+    }    \r
 \r
-    Ip6CleanService (IpSb);\r
-    FreePool (IpSb);\r
-  } else {\r
     //\r
     // Initialize the IP6 ID\r
     //\r
     mIp6Id = NET_RANDOM (NetRandomInitSeed ());\r
 \r
-    Ip6SetVariableData (IpSb);\r
+    return EFI_SUCCESS;\r
   }\r
 \r
+ON_ERROR:\r
+  Ip6CleanService (IpSb);\r
+  FreePool (IpSb);\r
   return Status;\r
 }\r
 \r
@@ -584,10 +593,11 @@ Ip6DriverBindingStart (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 Ip6DestroyChildEntryInHandleBuffer (\r
   IN LIST_ENTRY         *Entry,\r
   IN VOID               *Context\r
-)\r
+  )\r
 {\r
   IP6_PROTOCOL                  *IpInstance;\r
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
@@ -689,11 +699,6 @@ Ip6DriverBindingStop (
     State           = IpSb->State;\r
     IpSb->State     = IP6_SERVICE_DESTROY;\r
 \r
-    //\r
-    // Clear the variable data.\r
-    //\r
-    Ip6ClearVariableData (IpSb);\r
-\r
     Status = Ip6CleanService (IpSb);\r
     if (EFI_ERROR (Status)) {\r
       IpSb->State = State;\r
@@ -931,9 +936,6 @@ Ip6ServiceBindingDestroyChild (
   }\r
 \r
   Status = Ip6CleanProtocol (IpInstance);\r
-\r
-  Ip6SetVariableData (IpSb);\r
-\r
   if (EFI_ERROR (Status)) {\r
     gBS->InstallMultipleProtocolInterfaces (\r
            &ChildHandle,\r