wlan: Retry Auth if AP gives MAX_ASSOC_STA_REACHED
This is IOT issue with the AP who has 5G prefer feature.
The AP rejects with eSIR_MAC_MAX_ASSOC_STA_REACHED_STATUS
in AUTH frame when the 2.4G STA tries AUTH process for
the first 2 times. If STA tries the 3rd time in 2.4G,
then the AUTH process will success.
Change-Id: I8afa43cb9728f73172f543bfb9aac65b0b225aa2
CRs-Fixed: 1111136
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index 5a52a2c..f3e566c 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -1556,6 +1556,25 @@
#define CFG_ENABLE_DFS_PNO_CHNL_SCAN_MAX ( 1 )
#define CFG_ENABLE_DFS_PNO_CHNL_SCAN_DEFAULT ( 1 )
+/*
+ * gStaAuthRetriesForCode17
+ * It is for an IOT issue.
+ * When DUT receives MAX_ASSOC_STA_REACHED_STATUS as
+ * response for Auth frame this ini decides how many
+ * times DUT has to retry.
+ *
+ * This is mainly for an AP where it wants to force
+ * the Station to connect to its 5G profile session
+ * (Dual band AP) by rejecting the Auth on 2.4G band.
+ * But if a station is only 2.4G capable it can try
+ * 3 times where third time AP will allow the
+ * station to connect to this AP.
+ */
+#define CFG_STA_AUTH_RETRIES_FOR_CODE17_NAME "gStaAuthRetriesForCode17"
+#define CFG_STA_AUTH_RETRIES_FOR_CODE17_MIN ( 0 )
+#define CFG_STA_AUTH_RETRIES_FOR_CODE17_MAX ( 5 )
+#define CFG_STA_AUTH_RETRIES_FOR_CODE17_DEFAULT ( 0 )
+
typedef enum
{
eHDD_LINK_SPEED_REPORT_ACTUAL = 0,
@@ -3650,6 +3669,7 @@
#endif /* SAP_AUTH_OFFLOAD */
uint32_t max_sched_scan_plan_interval;
uint32_t max_sched_scan_plan_iterations;
+ uint32_t sta_auth_retries_for_code17;
} hdd_config_t;
/*---------------------------------------------------------------------------
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index c485114..b95f9b2 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -3907,6 +3907,13 @@
VAR_FLAGS_OPTIONAL,
(void *) CFG_MDNS_RESPONSE_TYPE_SRV_TGT_DEFAULT ),
#endif /* MDNS_OFFLOAD */
+
+ REG_VARIABLE( CFG_STA_AUTH_RETRIES_FOR_CODE17_NAME, WLAN_PARAM_Integer,
+ hdd_config_t, sta_auth_retries_for_code17,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_STA_AUTH_RETRIES_FOR_CODE17_DEFAULT,
+ CFG_STA_AUTH_RETRIES_FOR_CODE17_MIN,
+ CFG_STA_AUTH_RETRIES_FOR_CODE17_MAX ),
};
/*
@@ -4546,6 +4553,9 @@
pHddCtx->cfg_ini->enable_lfr_mbb);
#endif
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
+ "Name = [sta_auth_retries_for_code17] Value = [%u] ",
+ pHddCtx->cfg_ini->sta_auth_retries_for_code17);
}
@@ -6531,6 +6541,8 @@
smeConfig->csrConfig.edca_be_aifs =
pHddCtx->cfg_ini->edca_be_aifs;
+ smeConfig->csrConfig.sta_auth_retries_for_code17 =
+ pHddCtx->cfg_ini->sta_auth_retries_for_code17;
sme_set_mgmt_frm_via_wq5((tHalHandle)(pHddCtx->hHal),
pHddCtx->cfg_ini->sendMgmtPktViaWQ5);
diff --git a/CORE/MAC/inc/aniGlobal.h b/CORE/MAC/inc/aniGlobal.h
index ddfbc23..9ebe806 100644
--- a/CORE/MAC/inc/aniGlobal.h
+++ b/CORE/MAC/inc/aniGlobal.h
@@ -1096,6 +1096,7 @@
uint32_t sap_auth_offload_sec_type;
#endif /* SAP_AUTH_OFFLOAD */
bool max_power_cmd_pending;
+ uint32_t sta_auth_retries_for_code17;
} tAniSirGlobal;
#ifdef FEATURE_WLAN_TDLS
diff --git a/CORE/MAC/src/pe/include/limSession.h b/CORE/MAC/src/pe/include/limSession.h
index f00449c..e0184ac 100644
--- a/CORE/MAC/src/pe/include/limSession.h
+++ b/CORE/MAC/src/pe/include/limSession.h
@@ -361,6 +361,7 @@
tANI_BOOLEAN is11Gonly;
tANI_BOOLEAN addBssfailed;
tDot11fIEExtCap ExtCap;
+ uint32_t sta_auth_retries_for_code17;
}tPESession, *tpPESession;
#define LIM_MAX_ACTIVE_SESSIONS 4
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
index 2c9a860..2e382d9 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
@@ -773,8 +773,41 @@
return;
}
+void limDoSendAuthMgmtFrame(tpAniSirGlobal pMac, tpPESession psessionEntry)
+{
+ tSirMacAuthFrameBody authFrameBody;
-
+ //Prepare & send Authentication frame
+ authFrameBody.authAlgoNumber =
+ (tANI_U8) pMac->lim.gpLimMlmAuthReq->authType;
+ authFrameBody.authTransactionSeqNumber = SIR_MAC_AUTH_FRAME_1;
+ authFrameBody.authStatusCode = 0;
+ pMac->authAckStatus = LIM_AUTH_ACK_NOT_RCD;
+ limSendAuthMgmtFrame(pMac,
+ &authFrameBody,
+ pMac->lim.gpLimMlmAuthReq->peerMacAddr,
+ LIM_NO_WEP_IN_FC, psessionEntry, eSIR_TRUE);
+ if (tx_timer_activate(&pMac->lim.limTimers.gLimAuthFailureTimer)
+ != TX_SUCCESS) {
+ //Could not start Auth failure timer.
+ //Log error
+ limLog(pMac, LOGP,
+ FL("could not start Auth failure timer"));
+ //Cleanup as if auth timer expired
+ limProcessAuthFailureTimeout(pMac);
+ } else {
+ MTRACE(macTrace(pMac, TRACE_CODE_TIMER_ACTIVATE,
+ psessionEntry->peSessionId, eLIM_AUTH_RETRY_TIMER));
+ //Activate Auth Retry timer
+ if (tx_timer_activate
+ (&pMac->lim.limTimers.gLimPeriodicAuthRetryTimer)
+ != TX_SUCCESS) {
+ limLog(pMac, LOGP,
+ FL("could not activate Auth Retry timer"));
+ }
+ }
+ return;
+}
/*
* Creates a Raw frame to be sent before every Scan, if required.
@@ -2397,7 +2430,6 @@
{
tANI_U32 numPreAuthContexts;
tSirMacAddr currentBssId;
- tSirMacAuthFrameBody authFrameBody;
tLimMlmAuthCnf mlmAuthCnf;
struct tLimPreAuthNode *preAuthNode;
tpDphHashNode pStaDs;
@@ -2524,17 +2556,6 @@
psessionEntry->limMlmState = eLIM_MLM_WT_AUTH_FRAME2_STATE;
MTRACE(macTrace(pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId, psessionEntry->limMlmState));
- /// Prepare & send Authentication frame
- authFrameBody.authAlgoNumber =
- (tANI_U8) pMac->lim.gpLimMlmAuthReq->authType;
- authFrameBody.authTransactionSeqNumber = SIR_MAC_AUTH_FRAME_1;
- authFrameBody.authStatusCode = 0;
- pMac->authAckStatus = LIM_AUTH_ACK_NOT_RCD;
- limSendAuthMgmtFrame(pMac,
- &authFrameBody,
- pMac->lim.gpLimMlmAuthReq->peerMacAddr,
- LIM_NO_WEP_IN_FC, psessionEntry, eSIR_TRUE);
-
//assign appropriate sessionId to the timer object
pMac->lim.limTimers.gLimAuthFailureTimer.sessionId = sessionId;
/* assign appropriate sessionId to the timer object */
@@ -2542,27 +2563,8 @@
limDeactivateAndChangeTimer(pMac, eLIM_AUTH_RETRY_TIMER);
// Activate Auth failure timer
MTRACE(macTrace(pMac, TRACE_CODE_TIMER_ACTIVATE, psessionEntry->peSessionId, eLIM_AUTH_FAIL_TIMER));
- if (tx_timer_activate(&pMac->lim.limTimers.gLimAuthFailureTimer)
- != TX_SUCCESS)
- {
- /// Could not start Auth failure timer.
- // Log error
- limLog(pMac, LOGP,
- FL("could not start Auth failure timer"));
- // Cleanup as if auth timer expired
- limProcessAuthFailureTimeout(pMac);
- }
- else
- {
- MTRACE(macTrace(pMac, TRACE_CODE_TIMER_ACTIVATE,
- psessionEntry->peSessionId, eLIM_AUTH_RETRY_TIMER));
- // Activate Auth Retry timer
- if (tx_timer_activate(&pMac->lim.limTimers.gLimPeriodicAuthRetryTimer)
- != TX_SUCCESS)
- {
- limLog(pMac, LOGP, FL("could not activate Auth Retry timer"));
- }
- }
+
+ limDoSendAuthMgmtFrame(pMac, psessionEntry);
return;
}
else
diff --git a/CORE/MAC/src/pe/lim/limSecurityUtils.c b/CORE/MAC/src/pe/lim/limSecurityUtils.c
index 45a7823..6470318 100644
--- a/CORE/MAC/src/pe/lim/limSecurityUtils.c
+++ b/CORE/MAC/src/pe/lim/limSecurityUtils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2015, 2017 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -473,10 +473,6 @@
} /*** end limDeletePreAuthNode() ***/
-
-
-
-
/**
* limRestoreFromPreAuthState
*
@@ -515,13 +511,6 @@
/* Update PE session ID*/
mlmAuthCnf.sessionId = sessionEntry->peSessionId;
-
- /// Free up buffer allocated
- /// for pMac->lim.gLimMlmAuthReq
- vos_mem_free(pMac->lim.gpLimMlmAuthReq);
- pMac->lim.gpLimMlmAuthReq = NULL;
-
- sessionEntry->limMlmState = sessionEntry->limPrevMlmState;
MTRACE(macTrace(pMac, TRACE_CODE_MLM_STATE, sessionEntry->peSessionId, sessionEntry->limMlmState));
/* Set the authAckStatus status flag as sucess as
@@ -548,9 +537,25 @@
pMac->lim.gLimPreAuthChannelNumber = 0;
}
- limPostSmeMessage(pMac,
+ if ((protStatusCode == eSIR_MAC_MAX_ASSOC_STA_REACHED_STATUS)
+ && (sessionEntry->sta_auth_retries_for_code17 <
+ pMac->sta_auth_retries_for_code17)) {
+ limLog(pMac, LOG1, FL("Retry Auth "));
+ limDoSendAuthMgmtFrame(pMac, sessionEntry);
+ sessionEntry->sta_auth_retries_for_code17++;
+ } else {
+ /// Free up buffer allocated
+ /// for pMac->lim.gLimMlmAuthReq
+ vos_mem_free(pMac->lim.gpLimMlmAuthReq);
+ pMac->lim.gpLimMlmAuthReq = NULL;
+
+ sessionEntry->limMlmState = sessionEntry->limPrevMlmState;
+
+ limPostSmeMessage(pMac,
LIM_MLM_AUTH_CNF,
(tANI_U32 *) &mlmAuthCnf);
+ sessionEntry->sta_auth_retries_for_code17 = 0;
+ }
} /*** end limRestoreFromAuthState() ***/
diff --git a/CORE/MAC/src/pe/lim/limTypes.h b/CORE/MAC/src/pe/lim/limTypes.h
index 6a8fb8d..88a2abe 100644
--- a/CORE/MAC/src/pe/lim/limTypes.h
+++ b/CORE/MAC/src/pe/lim/limTypes.h
@@ -701,7 +701,7 @@
void limSendDeauthMgmtFrame(tpAniSirGlobal, tANI_U16, tSirMacAddr, tpPESession, tANI_BOOLEAN waitForAck);
void limSendSmeDisassocDeauthNtf( tpAniSirGlobal pMac,
eHalStatus status, tANI_U32 *pCtx );
-
+void limDoSendAuthMgmtFrame(tpAniSirGlobal, tpPESession);
void limContinueChannelScan(tpAniSirGlobal);
tSirResultCodes limMlmAddBss(tpAniSirGlobal, tLimMlmStartReq *,tpPESession psessionEntry);
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index 7e88126..e5b8968 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -1244,6 +1244,7 @@
uint32_t edca_bk_aifs;
uint32_t edca_be_aifs;
tANI_BOOLEAN disable_scan_during_sco;
+ uint32_t sta_auth_retries_for_code17;
}tCsrConfigParam;
//Tush
diff --git a/CORE/SME/src/csr/csrNeighborRoam.c b/CORE/SME/src/csr/csrNeighborRoam.c
index 6bebe7a..85ce313 100644
--- a/CORE/SME/src/csr/csrNeighborRoam.c
+++ b/CORE/SME/src/csr/csrNeighborRoam.c
@@ -1192,14 +1192,20 @@
{
tpCsrNeighborRoamBSSInfo pNeighborBssNode = NULL;
tListElem *pEntry;
+ uint32_t retries;
+
+ retries = pMac->sta_auth_retries_for_code17 >
+ CSR_NEIGHBOR_ROAM_MAX_NUM_PREAUTH_RETRIES ?
+ pMac->sta_auth_retries_for_code17 :
+ CSR_NEIGHBOR_ROAM_MAX_NUM_PREAUTH_RETRIES;
smsLog(pMac, LOGE, FL("Preauth failed retry number %d, status = 0x%x"),
pNeighborRoamInfo->FTRoamInfo.numPreAuthRetries, limStatus);
/* Preauth failed. Add the bssId to the preAuth failed list MAC Address. Also remove the AP from roamable AP list */
- if ((pNeighborRoamInfo->FTRoamInfo.numPreAuthRetries >=
- CSR_NEIGHBOR_ROAM_MAX_NUM_PREAUTH_RETRIES) ||
- (eSIR_LIM_MAX_STA_REACHED_ERROR == limStatus))
+ if ((pNeighborRoamInfo->FTRoamInfo.numPreAuthRetries >= retries) ||
+ ((eSIR_LIM_MAX_STA_REACHED_ERROR == limStatus) &&
+ (pMac->sta_auth_retries_for_code17 == 0)))
{
/* We are going to remove the node as it fails for more than MAX tries. Reset this count to 0 */
pNeighborRoamInfo->FTRoamInfo.numPreAuthRetries = 0;
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 6014a6f..231709c 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -1775,6 +1775,9 @@
pMac->fDeferIMPSTime = pSmeConfigParams->fDeferIMPSTime;
pMac->fBtcEnableIndTimerVal = pSmeConfigParams->fBtcEnableIndTimerVal;
+ pMac->sta_auth_retries_for_code17 =
+ pSmeConfigParams->csrConfig.sta_auth_retries_for_code17;
+
return status;
}