summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>2011-09-16 06:11:13 +0000
committerydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>2011-09-16 06:11:13 +0000
commitf10810ca892119703a4d809aa5fac903f5c1236b (patch)
tree0e1f34fc770f0e879d2e9d41e7ff8f8287a1a502
parent43e615983e2b68fc257ed19b4b6b4ff75c707e54 (diff)
downloadedk2-platforms-f10810ca892119703a4d809aa5fac903f5c1236b.tar.xz
Update the Ip6Dxe and IScsiDxe to keep the old behaviors after add exit action when Config_Access_Protocol.CallBack function returns Submit or Reset which is follow UEFI spec 2.3.1.
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
-rw-r--r--NetworkPkg/IScsiDxe/IScsiConfig.c14
-rw-r--r--NetworkPkg/Ip6Dxe/Ip6ConfigNv.c4
-rw-r--r--NetworkPkg/Ip6Dxe/Ip6DxeStrings.unibin10226 -> 10244 bytes
3 files changed, 9 insertions, 9 deletions
diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c b/NetworkPkg/IScsiDxe/IScsiConfig.c
index e6852a9b0a..7a528198ef 100644
--- a/NetworkPkg/IScsiDxe/IScsiConfig.c
+++ b/NetworkPkg/IScsiDxe/IScsiConfig.c
@@ -2153,7 +2153,7 @@ IScsiFormCallback (
);
}
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;
break;
case KEY_ADD_ATTEMPT:
@@ -2179,7 +2179,7 @@ IScsiFormCallback (
}
IScsiConfigUpdateAttempt ();
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;
break;
case KEY_IGNORE_DELETE_ATTEMPT:
@@ -2188,7 +2188,7 @@ IScsiFormCallback (
OldIfrNvData.DeleteAttemptList,
sizeof (IfrNvData->DeleteAttemptList)
);
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD;
break;
case KEY_ORDER_ATTEMPT_CONFIG:
@@ -2213,7 +2213,7 @@ IScsiFormCallback (
}
IScsiConfigUpdateAttempt ();
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;
break;
case KEY_IGNORE_ORDER_CHANGES:
@@ -2222,7 +2222,7 @@ IScsiFormCallback (
OldIfrNvData.DynamicOrderedList,
sizeof (IfrNvData->DynamicOrderedList)
);
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD;
break;
case KEY_ATTEMPT_NAME:
@@ -2241,7 +2241,7 @@ IScsiFormCallback (
IScsiConfigUpdateAttempt ();
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;
break;
case KEY_IP_MODE:
@@ -2419,7 +2419,7 @@ IScsiFormCallback (
break;
}
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;
break;
default:
diff --git a/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c b/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c
index d3efaa8e06..7bc049ca45 100644
--- a/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c
+++ b/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c
@@ -1746,12 +1746,12 @@ Ip6FormCallback (
case KEY_SAVE_CONFIG_CHANGES:
CopyMem (&OldIfrNvData, IfrNvData, sizeof (IP6_CONFIG_IFR_NVDATA));
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;
break;
case KEY_IGNORE_CONFIG_CHANGES:
CopyMem (IfrNvData, &OldIfrNvData, sizeof (IP6_CONFIG_IFR_NVDATA));
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD;
break;
case KEY_SAVE_CHANGES:
diff --git a/NetworkPkg/Ip6Dxe/Ip6DxeStrings.uni b/NetworkPkg/Ip6Dxe/Ip6DxeStrings.uni
index 01f3e996b8..c415eb15d1 100644
--- a/NetworkPkg/Ip6Dxe/Ip6DxeStrings.uni
+++ b/NetworkPkg/Ip6Dxe/Ip6DxeStrings.uni
Binary files differ