NetworkPkg: Change the default IPv6 config policy

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

diff --git a/NetworkPkg/Ip6Dxe/Ip6Driver.c b/NetworkPkg/Ip6Dxe/Ip6Driver.c
index 076dc605e6df8eb798ee0046efbf8f2abc021bc9..ba702904b5f5c76ad3700e4c211d8ab484d5b416 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 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r
   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
 \r
   This program and the accompanying materials\r
@@ -262,7 +262,6 @@ Ip6CreateService (
   EFI_STATUS                            Status;\r
   EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *MnpToken;\r
   EFI_MANAGED_NETWORK_CONFIG_DATA       *Config;\r
-  IP6_CONFIG_DATA_ITEM                  *DataItem;\r
 \r
   ASSERT (Service != NULL);\r
 \r
@@ -476,30 +475,6 @@ Ip6CreateService (
     goto ON_ERROR;\r
   }\r
 \r
-  //\r
-  // If there is any manual address, set it.\r
-  //\r
-  DataItem = &IpSb->Ip6ConfigInstance.DataItem[Ip6ConfigDataTypeManualAddress];\r
-  if (DataItem->Data.Ptr != NULL) {\r
-    DataItem->SetData (\r
-                &IpSb->Ip6ConfigInstance,\r
-                DataItem->DataSize,\r
-                DataItem->Data.Ptr\r
-                );\r
-  }\r
-\r
-  //\r
-  // If there is any gateway address, set it.\r
-  //\r
-  DataItem = &IpSb->Ip6ConfigInstance.DataItem[Ip6ConfigDataTypeGateway];\r
-  if (DataItem->Data.Ptr != NULL) {\r
-    DataItem->SetData (\r
-                &IpSb->Ip6ConfigInstance,\r
-                DataItem->DataSize,\r
-                DataItem->Data.Ptr\r
-                );\r
-  }\r
-\r
   InsertHeadList (&IpSb->Interfaces, &IpSb->DefaultInterface->Link);\r
 \r
   *Service = IpSb;\r
@@ -535,6 +510,12 @@ Ip6DriverBindingStart (
 {\r
   IP6_SERVICE               *IpSb;\r
   EFI_STATUS                Status;\r
+  EFI_IP6_CONFIG_PROTOCOL   *Ip6Cfg;\r
+  IP6_CONFIG_DATA_ITEM      *DataItem;\r
+\r
+  IpSb     = NULL;\r
+  Ip6Cfg   = NULL;\r
+  DataItem = NULL;\r
 \r
   //\r
   // Test for the Ip6 service binding protocol\r
@@ -560,6 +541,8 @@ Ip6DriverBindingStart (
 \r
   ASSERT (IpSb != NULL);\r
 \r
+  Ip6Cfg  = &IpSb->Ip6ConfigInstance.Ip6Config;\r
+\r
   //\r
   // Install the Ip6ServiceBinding Protocol onto ControlerHandle\r
   //\r
@@ -568,9 +551,53 @@ Ip6DriverBindingStart (
                   &gEfiIp6ServiceBindingProtocolGuid,\r
                   &IpSb->ServiceBinding,\r
                   &gEfiIp6ConfigProtocolGuid,\r
-                  &IpSb->Ip6ConfigInstance.Ip6Config,\r
+                  Ip6Cfg,\r
                   NULL\r
                   );\r
+  if (EFI_ERROR (Status)) {\r
+    goto ON_ERROR;\r
+  }\r
+\r
+  //\r
+  // Read the config data from NV variable again. \r
+  // The default data can be changed by other drivers.\r
+  //\r
+  Status = Ip6ConfigReadConfigData (IpSb->MacString, &IpSb->Ip6ConfigInstance);\r
+  if (EFI_ERROR (Status)) {\r
+    goto ON_ERROR;\r
+  }\r
+  \r
+  //\r
+  // If there is any default manual address, set it.\r
+  //\r
+  DataItem = &IpSb->Ip6ConfigInstance.DataItem[Ip6ConfigDataTypeManualAddress];\r
+  if (DataItem->Data.Ptr != NULL) {\r
+    Status = Ip6Cfg->SetData (\r
+                       Ip6Cfg,\r
+                       Ip6ConfigDataTypeManualAddress,\r
+                       DataItem->DataSize,\r
+                       DataItem->Data.Ptr\r
+                       );\r
+    if (EFI_ERROR(Status)) {\r
+      goto ON_ERROR;\r
+    }\r
+  }\r
+\r
+  //\r
+  // If there is any default gateway address, set it.\r
+  //\r
+  DataItem = &IpSb->Ip6ConfigInstance.DataItem[Ip6ConfigDataTypeGateway];\r
+  if (DataItem->Data.Ptr != NULL) {\r
+    Status = Ip6Cfg->SetData (\r
+                       Ip6Cfg,\r
+                       Ip6ConfigDataTypeGateway,\r
+                       DataItem->DataSize,\r
+                       DataItem->Data.Ptr\r
+                       );\r
+    if (EFI_ERROR(Status)) {\r
+      goto ON_ERROR;\r
+    }\r
+  }\r
 \r
   if (!EFI_ERROR (Status)) {\r
     //\r