From 72cf76868ce7b7cda1ba5f9eb28693557ff10256 Mon Sep 17 00:00:00 2001 From: Neo Hsueh Date: Thu, 1 Aug 2024 14:11:57 -0500 Subject: 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 Cc: Abner Chang Signed-off-by: Neo Hsueh --- .../WifiConnectionMgrHiiConfigAccess.c | 34 +--------------------- 1 file changed, 1 insertion(+), 33 deletions(-) (limited to 'NetworkPkg') diff --git a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrHiiConfigAccess.c b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrHiiConfigAccess.c index f242bdf056..00804e5467 100644 --- a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrHiiConfigAccess.c +++ b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrHiiConfigAccess.c @@ -1490,6 +1490,7 @@ WifiMgrDxeHiiConfigAccessCallback ( } else if (Action == EFI_BROWSER_ACTION_FORM_CLOSE) { switch (QuestionId) { case KEY_EAP_ENROLL_CERT_FROM_FILE: + case KEY_REFRESH_NETWORK_LIST: if (Private->CurrentNic->UserSelectedProfile == NULL) { break; @@ -1911,39 +1912,6 @@ WifiMgrDxeHiiConfigAccessCallback ( 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; -- cgit v1.2.3