commit 475bbc7207a52028bb464093c90bb04aab2f522c
author Linux Build Service Account <lnxbuild@localhost> Wed Sep 25 14:53:46 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Sep 25 14:53:46 2019 -0700
tree 55b8a26573119f2c3e35f5b65a442d8f8a99a0ed
parent 133b224f912f5866bd06388961e301892099768f
parent 2184e16e08b4940414d515014d263a336e8a03c1

Merge "wlan: Set negotiated auth type to OPEN for SAE-pmk cache case"

CORE/HDD/src/wlan_hdd_assoc.c

diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index bb6fa46..fa27193 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -4919,9 +4919,9 @@
 
     pRoamProfile->AuthType.numEntries = 1;
     hddLog( LOG1,
-           "%s: authType = %d RSNAuthType %d wpa_versions %d",
+           "%s: authType = %d RSNAuthType %d wpa_versions %d key_mgmt : 0x%x",
            __func__, pHddStaCtx->conn_info.authType, RSNAuthType,
-           pWextState->wpaVersion);
+           pWextState->wpaVersion, pWextState->authKeyMgmt);
 
     switch( pHddStaCtx->conn_info.authType)
     {
@@ -5008,6 +5008,10 @@
                 /* OWE case */
                 pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_OWE;
             } else
+            if (RSNAuthType == eCSR_AUTH_TYPE_SAE) {
+               /* SAE with open authentication case */
+               pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_SAE;
+            } else
             if( (pWextState->authKeyMgmt & IW_AUTH_KEY_MGMT_802_1X)
                     == IW_AUTH_KEY_MGMT_802_1X) {
                pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_RSN;

CORE/SME/src/csr/csrUtil.c

diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index 446de22..fa00158 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -3792,6 +3792,8 @@
                                 authentication)) {
                 if (eCSR_AUTH_TYPE_SAE == auth_type->authType[index])
                         *neg_authtype = eCSR_AUTH_TYPE_SAE;
+                if (eCSR_AUTH_TYPE_OPEN_SYSTEM == auth_type->authType[index])
+                        *neg_authtype = eCSR_AUTH_TYPE_OPEN_SYSTEM;
         }
         VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
                   FL("negotiated auth type is %d"), *neg_authtype);