NetworkPkg/WifiConnectionManagerDxe: Fix Connection Manager HII errors
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4824 Fix the wrong logic in WifiMgrDxeHiiConfigAccessCallback with EFI_BROWSER_ACTION_CHANGING action. Cc: Jiangang He <jiangang.he@amd.com> Cc: Abner Chang <abner.chang@amd.com> Signed-off-by: Neo Hsueh <Hong-Chih.Hsueh@amd.com>
This commit is contained in:
parent
cb9bdf3753
commit
72cf76868c
|
@ -1490,6 +1490,7 @@ WifiMgrDxeHiiConfigAccessCallback (
|
||||||
} else if (Action == EFI_BROWSER_ACTION_FORM_CLOSE) {
|
} else if (Action == EFI_BROWSER_ACTION_FORM_CLOSE) {
|
||||||
switch (QuestionId) {
|
switch (QuestionId) {
|
||||||
case KEY_EAP_ENROLL_CERT_FROM_FILE:
|
case KEY_EAP_ENROLL_CERT_FROM_FILE:
|
||||||
|
case KEY_REFRESH_NETWORK_LIST:
|
||||||
|
|
||||||
if (Private->CurrentNic->UserSelectedProfile == NULL) {
|
if (Private->CurrentNic->UserSelectedProfile == NULL) {
|
||||||
break;
|
break;
|
||||||
|
@ -1911,39 +1912,6 @@ WifiMgrDxeHiiConfigAccessCallback (
|
||||||
NULL
|
NULL
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Private->CurrentNic->UserSelectedProfile == NULL) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
Profile = Private->CurrentNic->UserSelectedProfile;
|
|
||||||
|
|
||||||
//
|
|
||||||
// Enter the network connection configuration page
|
|
||||||
// Recovery from restored data
|
|
||||||
//
|
|
||||||
if (HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_SSID), Profile->SSId, NULL) == 0) {
|
|
||||||
return EFI_OUT_OF_RESOURCES;
|
|
||||||
}
|
|
||||||
|
|
||||||
IfrNvData->SecurityType = Profile->SecurityType;
|
|
||||||
if (HiiSetString (
|
|
||||||
Private->RegisteredHandle,
|
|
||||||
STRING_TOKEN (STR_SECURITY_TYPE),
|
|
||||||
mSecurityType[IfrNvData->SecurityType],
|
|
||||||
NULL
|
|
||||||
) == 0)
|
|
||||||
{
|
|
||||||
return EFI_OUT_OF_RESOURCES;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( (IfrNvData->SecurityType == SECURITY_TYPE_WPA2_ENTERPRISE)
|
|
||||||
|| (IfrNvData->SecurityType == SECURITY_TYPE_WPA3_ENTERPRISE))
|
|
||||||
{
|
|
||||||
IfrNvData->EapAuthMethod = Profile->EapAuthMethod;
|
|
||||||
IfrNvData->EapSecondAuthMethod = Profile->EapSecondAuthMethod;
|
|
||||||
StrCpyS (IfrNvData->EapIdentity, EAP_IDENTITY_SIZE, Profile->EapIdentity);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue