Fix spelling typo in the NIC_IP4_CONFIG_INFO.Permanent variable name, which was incor...

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Ip4ConfigDxe / Ip4ConfigDriver.c

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
index 9ed9ae82a89bba43aa4cfe8c4ef46e576eca0c2b..56cce6e6f09817e85774b6bdf2679afc09daaabf 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
@@ -1,7 +1,7 @@
 /** @file\r
   The driver binding for IP4 CONFIG protocol.\r
 \r
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at<BR>\r
@@ -51,13 +51,19 @@ IP4_CONFIG_INSTANCE        mIp4ConfigTemplate = {
     FALSE,\r
     FALSE,\r
     {\r
-      0\r
+      {\r
+        0\r
+      }\r
     },\r
     {\r
-      0\r
+      {\r
+        0\r
+      }\r
     },\r
     {\r
-      0\r
+      {\r
+        0\r
+      }\r
     }\r
   },\r
   0,\r
@@ -65,12 +71,14 @@ IP4_CONFIG_INSTANCE        mIp4ConfigTemplate = {
   NULL,\r
   NULL,\r
   NULL,\r
-  EFI_NOT_READY,\r
+  0,\r
   {\r
     0,\r
     0,\r
     {\r
-      0\r
+      {\r
+        0\r
+      }\r
     }\r
   },\r
   (CHAR16 *) NULL,\r
@@ -79,7 +87,8 @@ IP4_CONFIG_INSTANCE        mIp4ConfigTemplate = {
   NULL,\r
   NULL,\r
   NULL,\r
-  TRUE\r
+  TRUE,\r
+  FALSE\r
 };\r
 \r
 /**\r
@@ -100,6 +109,8 @@ Ip4ConfigDriverEntryPoint (
   IN EFI_SYSTEM_TABLE       *SystemTable\r
   )\r
 {\r
+  mIp4ConfigTemplate.Result = EFI_NOT_READY;\r
+\r
   return EfiLibInstallDriverBindingComponentName2 (\r
            ImageHandle,\r
            SystemTable,\r
@@ -308,19 +319,7 @@ Ip4ConfigDriverBindingStart (
   //\r
   NicConfig = Ip4ConfigReadVariable (Instance);\r
   if (NicConfig != NULL) {\r
-    if (NicConfig->Perment) {\r
-      if (NicConfig->Source == IP4_CONFIG_SOURCE_STATIC) {\r
-        //\r
-        // Don't modify the permanent static configuration.\r
-        //\r
-      } else if (NicConfig->Source == IP4_CONFIG_SOURCE_DHCP) {\r
-        //\r
-        // Remove the previous acquired DHCP parameters.\r
-        //\r
-        ZeroMem (&NicConfig->Ip4Info, sizeof (EFI_IP4_IPCONFIG_DATA));\r
-        Ip4ConfigWriteVariable (Instance, NicConfig);\r
-      }\r
-    } else {\r
+    if (!NicConfig->Permanent) {\r
       //\r
       // Delete the non-permanent configuration.\r
       //\r