Update the Ip6Dxe and IScsiDxe to keep the old behaviors after add exit action when...

Signed-off-by: ydong10
Reviewed-by: lgao4
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12364 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c b/NetworkPkg/IScsiDxe/IScsiConfig.c
index e6852a9b0ad319390681aa1c854f19976cccef2c..7a528198ef8e78bd9a1014157d573cab74da8c9c 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiConfig.c
+++ b/NetworkPkg/IScsiDxe/IScsiConfig.c
@@ -2153,7 +2153,7 @@ IScsiFormCallback (
           );      \r
       }\r
 \r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
       break;\r
 \r
     case KEY_ADD_ATTEMPT:\r
@@ -2179,7 +2179,7 @@ IScsiFormCallback (
       }\r
 \r
       IScsiConfigUpdateAttempt ();\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
       break;\r
 \r
     case KEY_IGNORE_DELETE_ATTEMPT:\r
@@ -2188,7 +2188,7 @@ IScsiFormCallback (
         OldIfrNvData.DeleteAttemptList,\r
         sizeof (IfrNvData->DeleteAttemptList)\r
         );\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD;\r
       break;\r
 \r
     case KEY_ORDER_ATTEMPT_CONFIG:\r
@@ -2213,7 +2213,7 @@ IScsiFormCallback (
       }\r
 \r
       IScsiConfigUpdateAttempt ();\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
       break;\r
 \r
     case KEY_IGNORE_ORDER_CHANGES:\r
@@ -2222,7 +2222,7 @@ IScsiFormCallback (
         OldIfrNvData.DynamicOrderedList,\r
         sizeof (IfrNvData->DynamicOrderedList)\r
         );\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD;\r
       break;\r
 \r
     case KEY_ATTEMPT_NAME:\r
@@ -2241,7 +2241,7 @@ IScsiFormCallback (
 \r
       IScsiConfigUpdateAttempt ();\r
 \r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
       break;\r
 \r
     case KEY_IP_MODE:\r
@@ -2419,7 +2419,7 @@ IScsiFormCallback (
         break;\r
       }\r
 \r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
       break;\r
 \r
     default:\r

diff --git a/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c b/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c
index d3efaa8e06dbcd3918ae2061a61244e47ba841f4..7bc049ca45319597098dc6ffa7e3e9b72f0f6cdb 100644 (file)
--- a/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c
+++ b/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c
@@ -1746,12 +1746,12 @@ Ip6FormCallback (
 \r
   case KEY_SAVE_CONFIG_CHANGES:\r
     CopyMem (&OldIfrNvData, IfrNvData, sizeof (IP6_CONFIG_IFR_NVDATA));\r
-    *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
+    *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
     break;\r
 \r
   case KEY_IGNORE_CONFIG_CHANGES:\r
     CopyMem (IfrNvData, &OldIfrNvData, sizeof (IP6_CONFIG_IFR_NVDATA));\r
-    *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
+    *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD;\r
     break;\r
 \r
   case KEY_SAVE_CHANGES:\r

diff --git a/NetworkPkg/Ip6Dxe/Ip6DxeStrings.uni b/NetworkPkg/Ip6Dxe/Ip6DxeStrings.uni
index 01f3e996b8d101866e07e09a07af5fff98187525..c415eb15d174aec221cb5a26860b555b52c42a3c 100644 (file)
Binary files a/NetworkPkg/Ip6Dxe/Ip6DxeStrings.uni and b/NetworkPkg/Ip6Dxe/Ip6DxeStrings.uni differ