wlan: Retry Auth from host in case ack is not received for the Auth
In few APs with power save feature, if no STA is connected, the AP
does not respond to the Auth from STA, unless Auth is sent near to
the AP's beacon time. With currunt implementation host does not
retry the auth and wait for the auth timeout to happen before
returning connect failure.
With this change Host will retry the Auth frame with interval of
3/5 * beacon interval, if no Ack is received for the frame,
until the auth timeout happens.
This increases the probality for the Auth to be received by AP near
to its beacon and thus initiate the connection.
CRs-Fixed: 816177
Change-Id: I51a6032f910b32eb91d67cb078e6434016ae8650
diff --git a/CORE/MAC/inc/aniGlobal.h b/CORE/MAC/inc/aniGlobal.h
index 62e22f8..bd11297 100644
--- a/CORE/MAC/inc/aniGlobal.h
+++ b/CORE/MAC/inc/aniGlobal.h
@@ -240,6 +240,7 @@
TX_TIMER gLimPeriodicJoinProbeReqTimer;
TX_TIMER gLimDisassocAckTimer;
TX_TIMER gLimDeauthAckTimer;
+ TX_TIMER gLimPeriodicAuthRetryTimer;
// This timer is started when single shot NOA insert msg is sent to FW for scan in P2P GO mode
TX_TIMER gLimP2pSingleShotNoaInsertTimer;
/* This timer is used to convert active channel to
@@ -995,6 +996,13 @@
} tHalMacStartParameters;
+typedef enum
+{
+ LIM_AUTH_ACK_NOT_RCD,
+ LIM_AUTH_ACK_RCD_SUCCESS,
+ LIM_AUTH_ACK_RCD_FAILURE,
+} tAuthAckStatus;
+
// -------------------------------------------------------------------
/// MAC Sirius parameter structure
typedef struct sAniSirGlobal
@@ -1081,6 +1089,7 @@
v_U8_t roamDelayStatsEnabled;
tANI_BOOLEAN miracastVendorConfig;
v_BOOL_t fActiveScanOnDFSChannels;
+ tAuthAckStatus authAckStatus;
} tAniSirGlobal;
#ifdef FEATURE_WLAN_TDLS
diff --git a/CORE/MAC/src/include/sirParams.h b/CORE/MAC/src/include/sirParams.h
index fd9d24f..bb57992 100644
--- a/CORE/MAC/src/include/sirParams.h
+++ b/CORE/MAC/src/include/sirParams.h
@@ -807,6 +807,8 @@
#define SIR_LIM_TDLS_LINK_SETUP_CNF_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x2B)
#endif
#define SIR_LIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE (SIR_LIM_TIMEOUT_MSG_START + 0x2C)
+#define SIR_LIM_AUTH_RETRY_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x2D)
+
#define SIR_LIM_MSG_TYPES_END (SIR_LIM_MSG_TYPES_BEGIN+0xFF)
// SCH message types
diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index 07461c9..75b56eb 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -1245,6 +1245,7 @@
case SIR_LIM_ASSOC_FAIL_TIMEOUT:
case SIR_LIM_AUTH_FAIL_TIMEOUT:
case SIR_LIM_ADDTS_RSP_TIMEOUT:
+ case SIR_LIM_AUTH_RETRY_TIMEOUT:
retStatus = TRUE;
break;
diff --git a/CORE/MAC/src/pe/lim/limFT.c b/CORE/MAC/src/pe/lim/limFT.c
index 3846d05..99bea6c 100644
--- a/CORE/MAC/src/pe/lim/limFT.c
+++ b/CORE/MAC/src/pe/lim/limFT.c
@@ -395,7 +395,7 @@
limSendAuthMgmtFrame(pMac, &authFrame,
pMac->ft.ftPEContext.pFTPreAuthReq->preAuthbssId,
- LIM_NO_WEP_IN_FC, psessionEntry);
+ LIM_NO_WEP_IN_FC, psessionEntry, eSIR_FALSE);
return;
preauth_fail:
diff --git a/CORE/MAC/src/pe/lim/limProcessAuthFrame.c b/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
index e6fd228..2adcf9e 100644
--- a/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
@@ -163,7 +163,6 @@
pHdr = WDA_GET_RX_MAC_HEADER(pRxPacketInfo);
frameLen = WDA_GET_RX_PAYLOAD_LEN(pRxPacketInfo);
-
if (!frameLen)
{
@@ -249,7 +248,8 @@
psessionEntry->limSystemRole, MAC_ADDR_ARRAY(pHdr->sa) );)
limSendAuthMgmtFrame(pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
return;
}
@@ -311,7 +311,8 @@
limSendAuthMgmtFrame(pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
return;
}
@@ -349,7 +350,8 @@
limSendAuthMgmtFrame(pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
return;
}
@@ -384,7 +386,8 @@
limSendAuthMgmtFrame(pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
return;
} // if (!pKeyMapEntry->wepOn)
@@ -417,7 +420,8 @@
limSendAuthMgmtFrame(
pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
return;
@@ -470,7 +474,8 @@
limSendAuthMgmtFrame(pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
return;
}
@@ -503,7 +508,8 @@
limSendAuthMgmtFrame(
pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
return;
}
@@ -542,7 +548,8 @@
limSendAuthMgmtFrame(pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
return;
} // else if (wlan_cfgGetInt(CFG_PRIVACY_OPTION_IMPLEMENTED))
@@ -743,7 +750,8 @@
limSendAuthMgmtFrame(pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
return;
}
@@ -801,7 +809,8 @@
limSendAuthMgmtFrame(
pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
/// Send Auth indication to SME
@@ -861,7 +870,8 @@
limSendAuthMgmtFrame(
pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
return;
}
@@ -923,7 +933,8 @@
limSendAuthMgmtFrame(pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
limDeletePreAuthNode(pMac, pHdr->sa);
return;
@@ -967,7 +978,8 @@
limSendAuthMgmtFrame(
pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
} // if (wlan_cfgGetInt(CFG_PRIVACY_OPTION_IMPLEMENTED))
break;
@@ -998,7 +1010,8 @@
limSendAuthMgmtFrame(
pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
return;
} // end switch(pRxAuthFrameBody->authAlgoNumber)
@@ -1026,7 +1039,8 @@
limSendAuthMgmtFrame(pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
return;
} //end if (limIsAuthAlgoSupported(pRxAuthFrameBody->authAlgoNumber))
@@ -1187,7 +1201,8 @@
limSendAuthMgmtFrame(pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
return;
}
else
@@ -1235,7 +1250,8 @@
limSendAuthMgmtFrame(pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
limRestoreFromAuthState(pMac, eSIR_SME_NO_KEY_MAPPING_KEY_FOR_PEER,
eSIR_MAC_UNSPEC_FAILURE_REASON,psessionEntry);
@@ -1266,7 +1282,8 @@
limSendAuthMgmtFrame(pMac,
(tpSirMacAuthFrameBody) encrAuthFrame,
pHdr->sa,
- LIM_WEP_IN_FC,psessionEntry);
+ LIM_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
break;
} // end if (pKeyMapEntry->key == NULL)
@@ -1314,7 +1331,8 @@
limSendAuthMgmtFrame(
pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
limRestoreFromAuthState(pMac, eSIR_SME_INVALID_WEP_DEFAULT_KEY,
eSIR_MAC_UNSPEC_FAILURE_REASON,psessionEntry);
@@ -1345,7 +1363,8 @@
limSendAuthMgmtFrame(pMac,
(tpSirMacAuthFrameBody) encrAuthFrame,
pHdr->sa,
- LIM_WEP_IN_FC,psessionEntry);
+ LIM_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
break;
} // end if (pKeyMapEntry)
@@ -1396,7 +1415,8 @@
limSendAuthMgmtFrame(pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
return;
}
@@ -1426,7 +1446,8 @@
limSendAuthMgmtFrame(pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
return;
}
@@ -1456,7 +1477,8 @@
limSendAuthMgmtFrame(pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
return;
}
@@ -1481,7 +1503,8 @@
limSendAuthMgmtFrame(
pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
/// Delete pre-auth context of STA
limDeletePreAuthNode(pMac,
@@ -1536,7 +1559,8 @@
limSendAuthMgmtFrame(pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
/// Send Auth indication to SME
vos_mem_copy((tANI_U8 *) mlmAuthInd.peerMacAddr,
@@ -1575,7 +1599,8 @@
limSendAuthMgmtFrame(pMac, &authFrame,
pHdr->sa,
- LIM_NO_WEP_IN_FC,psessionEntry);
+ LIM_NO_WEP_IN_FC,
+ psessionEntry, eSIR_FALSE);
return;
}
diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
index 11d8971..b8839db 100644
--- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
+++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
@@ -1831,6 +1831,7 @@
case SIR_LIM_DISASSOC_ACK_TIMEOUT:
case SIR_LIM_DEAUTH_ACK_TIMEOUT:
case SIR_LIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE:
+ case SIR_LIM_AUTH_RETRY_TIMEOUT:
// These timeout messages are handled by MLM sub module
limProcessMlmReqMessages(pMac,
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
index 9a2815e..8de4aa5 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
@@ -88,6 +88,8 @@
static void limProcessAuthRspTimeout(tpAniSirGlobal, tANI_U32);
static void limProcessAssocFailureTimeout(tpAniSirGlobal, tANI_U32);
static void limProcessPeriodicJoinProbeReqTimer(tpAniSirGlobal);
+static void limProcessAuthRetryTimer(tpAniSirGlobal);
+
static void limProcessMlmRemoveKeyReq(tpAniSirGlobal pMac, tANI_U32 * pMsgBuf);
void
@@ -159,6 +161,9 @@
limProcessInsertSingleShotNOATimeout(pMac); break;
case SIR_LIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE:
limConvertActiveChannelToPassiveChannel(pMac); break;
+ case SIR_LIM_AUTH_RETRY_TIMEOUT:
+ limProcessAuthRetryTimer(pMac);
+ break;
case SIR_LIM_DISASSOC_ACK_TIMEOUT: limProcessDisassocAckTimeout(pMac); break;
case SIR_LIM_DEAUTH_ACK_TIMEOUT: limProcessDeauthAckTimeout(pMac); break;
case LIM_MLM_ADDBA_REQ: limProcessMlmAddBAReq( pMac, Msg->bodyptr ); break;
@@ -2502,14 +2507,17 @@
(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);
+ 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 */
+ pMac->lim.limTimers.gLimPeriodicAuthRetryTimer.sessionId = sessionId;
+ 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)
@@ -2522,7 +2530,17 @@
// 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;
}
else
@@ -4231,6 +4249,75 @@
return;
} /*** limProcessPeriodicJoinProbeReqTimer() ***/
+/**
+ * limProcessAuthRetryTimer()
+ *
+ *FUNCTION:
+ * This function is called to process Auth Retry request
+ * send during joining process.
+ *
+ *LOGIC:
+ *
+ *ASSUMPTIONS:
+ *
+ *NOTE:
+ *
+ * @param pMac Pointer to Global MAC structure
+ * @return None
+ */
+
+static void limProcessAuthRetryTimer(tpAniSirGlobal pMac)
+{
+ tpPESession psessionEntry;
+ limLog(pMac, LOG1, FL(" ENTER "));
+ if ((psessionEntry =
+ peFindSessionBySessionId(pMac,
+ pMac->lim.limTimers.gLimPeriodicAuthRetryTimer.sessionId)) == NULL)
+ {
+ limLog(pMac, LOGE,FL("session does not exist for given SessionId : %d"),
+ pMac->lim.limTimers.gLimPeriodicAuthRetryTimer.sessionId);
+ return;
+ }
+
+ if ((VOS_TRUE ==
+ tx_timer_running(&pMac->lim.limTimers.gLimAuthFailureTimer)) &&
+ (psessionEntry->limMlmState == eLIM_MLM_WT_AUTH_FRAME2_STATE) &&
+ (LIM_AUTH_ACK_RCD_SUCCESS != pMac->authAckStatus))
+ {
+ tSirMacAuthFrameBody authFrameBody;
+
+ /* Send the auth retry only in case we have received ack failure
+ * else just restart the retry timer.
+ */
+ if (LIM_AUTH_ACK_RCD_FAILURE == pMac->authAckStatus)
+ {
+ /// Prepare & send Authentication frame
+ authFrameBody.authAlgoNumber =
+ (tANI_U8) pMac->lim.gpLimMlmAuthReq->authType;
+ authFrameBody.authTransactionSeqNumber = SIR_MAC_AUTH_FRAME_1;
+ authFrameBody.authStatusCode = 0;
+ limLog(pMac, LOGW, FL("Retry Auth "));
+ pMac->authAckStatus = LIM_AUTH_ACK_NOT_RCD;
+ limSendAuthMgmtFrame(pMac,
+ &authFrameBody,
+ pMac->lim.gpLimMlmAuthReq->peerMacAddr,
+ LIM_NO_WEP_IN_FC, psessionEntry, eSIR_TRUE);
+ }
+
+ limDeactivateAndChangeTimer(pMac, eLIM_AUTH_RETRY_TIMER);
+
+ // Activate Auth Retry timer
+ if (tx_timer_activate(&pMac->lim.limTimers.gLimPeriodicAuthRetryTimer)
+ != TX_SUCCESS)
+ {
+ limLog(pMac, LOGE,
+ FL("could not activate Auth Retry failure timer"));
+ return;
+ }
+ }
+ return;
+} /*** limProcessAuthRetryTimer() ***/
+
/**
* limProcessAuthFailureTimeout()
diff --git a/CORE/MAC/src/pe/lim/limSecurityUtils.c b/CORE/MAC/src/pe/lim/limSecurityUtils.c
index 147014b..45a7823 100644
--- a/CORE/MAC/src/pe/lim/limSecurityUtils.c
+++ b/CORE/MAC/src/pe/lim/limSecurityUtils.c
@@ -524,8 +524,13 @@
sessionEntry->limMlmState = sessionEntry->limPrevMlmState;
MTRACE(macTrace(pMac, TRACE_CODE_MLM_STATE, sessionEntry->peSessionId, sessionEntry->limMlmState));
-
-
+ /* Set the authAckStatus status flag as sucess as
+ * host have received the auth rsp and no longer auth
+ * retry is needed also cancel the auth rety timer
+ */
+ pMac->authAckStatus = LIM_AUTH_ACK_RCD_SUCCESS;
+ // 'Change' timer for future activations
+ limDeactivateAndChangeTimer(pMac, eLIM_AUTH_RETRY_TIMER);
// 'Change' timer for future activations
limDeactivateAndChangeTimer(pMac, eLIM_AUTH_FAIL_TIMER);
diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index 3964669..7e6a832 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -3504,6 +3504,31 @@
} // limSendReassocReqMgmtFrame
+eHalStatus limAuthTxCompleteCnf(tpAniSirGlobal pMac, void *pData)
+ {
+ tANI_U32 txCompleteSuccess;
+
+ if (!pData)
+ {
+ limLog(pMac, LOG1,
+ FL(" pData is NULL"));
+ return eHAL_STATUS_FAILURE;
+ }
+ txCompleteSuccess = *((tANI_U32*) pData);
+
+ limLog(pMac, LOG1,
+ FL("txCompleteSuccess= %d"),txCompleteSuccess);
+ if(txCompleteSuccess)
+ {
+ pMac->authAckStatus = LIM_AUTH_ACK_RCD_SUCCESS;
+ // 'Change' timer for future activations
+ limDeactivateAndChangeTimer(pMac, eLIM_AUTH_RETRY_TIMER);
+ }
+ else
+ pMac->authAckStatus = LIM_AUTH_ACK_RCD_FAILURE;
+ return eHAL_STATUS_SUCCESS;
+}
+
/**
* \brief Send an Authentication frame
*
@@ -3531,7 +3556,8 @@
tpSirMacAuthFrameBody pAuthFrameBody,
tSirMacAddr peerMacAddr,
tANI_U8 wepBit,
- tpPESession psessionEntry
+ tpPESession psessionEntry,
+ tAniBool waitForAck
)
{
tANI_U8 *pFrame, *pBody;
@@ -3801,8 +3827,9 @@
txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK;
}
- limLog( pMac, LOG1, FL("Sending Auth Frame over WQ5 to "MAC_ADDRESS_STR
- " From " MAC_ADDRESS_STR),MAC_ADDR_ARRAY(pMacHdr->da),
+ limLog( pMac, LOG1,
+ FL("Sending Auth Frame over WQ5 with waitForAck %d to "MAC_ADDRESS_STR
+ " From " MAC_ADDRESS_STR), waitForAck, MAC_ADDR_ARRAY(pMacHdr->da),
MAC_ADDR_ARRAY(psessionEntry->selfMacAddr));
txFlag |= HAL_USE_FW_IN_TX_PATH;
@@ -3815,23 +3842,47 @@
( !IS_BROADCAST_MAC(peerMacAddr) ) ){
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
+ if(eSIR_TRUE == waitForAck)
+ {
+ pMac->authAckStatus = LIM_AUTH_ACK_NOT_RCD;
- /// Queue Authentication frame in high priority WQ
- halstatus = halTxFrame( pMac, pPacket, ( tANI_U16 ) frameLen,
+ halstatus = halTxFrameWithTxComplete( pMac, pPacket,
+ ( tANI_U16 ) frameLen,
+ HAL_TXRX_FRM_802_11_MGMT,
+ ANI_TXDIR_TODS,
+ 7,//SMAC_SWBD_TX_TID_MGMT_HIGH,
+ limTxComplete, pFrame, limAuthTxCompleteCnf, txFlag );
+ MTRACE(macTrace(pMac, TRACE_CODE_TX_COMPLETE,
+ psessionEntry->peSessionId,
+ halstatus));
+ if (!HAL_STATUS_SUCCESS(halstatus))
+ {
+ limLog( pMac, LOGE,
+ FL("Could not send Auth frame, retCode=%X "),
+ halstatus );
+ pMac->authAckStatus = LIM_AUTH_ACK_RCD_FAILURE;
+ //Pkt will be freed up by the callback
+ }
+ }
+ else
+ {
+ /// Queue Authentication frame in high priority WQ
+ halstatus = halTxFrame( pMac, pPacket, ( tANI_U16 ) frameLen,
HAL_TXRX_FRM_802_11_MGMT,
ANI_TXDIR_TODS,
7,//SMAC_SWBD_TX_TID_MGMT_HIGH,
limTxComplete, pFrame, txFlag );
- MTRACE(macTrace(pMac, TRACE_CODE_TX_COMPLETE,
+ MTRACE(macTrace(pMac, TRACE_CODE_TX_COMPLETE,
psessionEntry->peSessionId,
halstatus));
- if ( ! HAL_STATUS_SUCCESS ( halstatus ) )
- {
+ if ( ! HAL_STATUS_SUCCESS ( halstatus ) )
+ {
limLog(pMac, LOGE,
FL("*** Could not send Auth frame, retCode=%X ***"),
halstatus);
//Pkt will be freed up by the callback
+ }
}
return;
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.c b/CORE/MAC/src/pe/lim/limTimerUtils.c
index f0480a9..e4f2c1f 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.c
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -54,6 +54,8 @@
#define LIM_KEEPALIVE_TIMER_MS 3000
// Lim JoinProbeRequest Retry timer default (200)ms
#define LIM_JOIN_PROBE_REQ_TIMER_MS 200
+#define LIM_AUTH_RETRY_TIMER_MS 60
+
//default beacon interval value used in HB timer interval calculation
#define LIM_HB_TIMER_BEACON_INTERVAL 100
@@ -257,7 +259,18 @@
limLog(pMac, LOGP, FL("could not create Periodic Join Probe Request timer"));
goto err_timer;
}
-
+ //Send Auth frame every 60 ms
+ if ((tx_timer_create(&pMac->lim.limTimers.gLimPeriodicAuthRetryTimer,
+ "Periodic AUTH Timer",
+ limTimerHandler, SIR_LIM_AUTH_RETRY_TIMEOUT,
+ SYS_MS_TO_TICKS(LIM_AUTH_RETRY_TIMER_MS), 0,
+ TX_NO_ACTIVATE)) != TX_SUCCESS)
+ {
+ /// Could not create Periodic Join Probe Request timer.
+ // Log error
+ limLog(pMac, LOGP, FL("could not create Periodic AUTH Timer timer"));
+ goto err_timer;
+ }
if (wlan_cfgGetInt(pMac, WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT,
&cfgValue) != eSIR_SUCCESS)
{
@@ -733,6 +746,7 @@
tx_timer_delete(&pMac->lim.limTimers.gLimAssocFailureTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimJoinFailureTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimPeriodicJoinProbeReqTimer);
+ tx_timer_delete(&pMac->lim.limTimers.gLimPeriodicAuthRetryTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimQuietBssTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimQuietTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimChannelSwitchTimer);
@@ -1008,6 +1022,7 @@
limDeactivateAndChangeTimer(tpAniSirGlobal pMac, tANI_U32 timerId)
{
tANI_U32 val=0, val1=0;
+ tpPESession psessionEntry;
MTRACE(macTrace(pMac, TRACE_CODE_TIMER_DEACTIVATE, NO_SESSION, timerId));
@@ -1304,6 +1319,37 @@
break;
+ case eLIM_AUTH_RETRY_TIMER:
+
+ if (tx_timer_deactivate(&pMac->lim.limTimers.gLimPeriodicAuthRetryTimer)
+ != TX_SUCCESS)
+ {
+ // Could not deactivate Auth Retry Timer.
+ limLog(pMac, LOGP,
+ FL("Unable to deactivate Auth Retry timer"));
+ }
+ if ((psessionEntry = peFindSessionBySessionId(pMac,
+ pMac->lim.limTimers.gLimPeriodicAuthRetryTimer.sessionId))
+ == NULL)
+ {
+ limLog(pMac, LOGP,
+ FL("session does not exist for given SessionId : %d"),
+ pMac->lim.limTimers.gLimPeriodicAuthRetryTimer.sessionId);
+ break;
+ }
+ /* 3/5 of the beacon interval*/
+ val = psessionEntry->beaconParams.beaconInterval * 3/5;
+ val = SYS_MS_TO_TICKS(val);
+ if (tx_timer_change(&pMac->lim.limTimers.gLimPeriodicAuthRetryTimer,
+ val, 0) != TX_SUCCESS)
+ {
+ // Could not change Auth Retry timer.
+ // Log error
+ limLog(pMac, LOGP, FL("Unable to change Auth Retry timer"));
+ }
+
+ break;
+
case eLIM_ASSOC_FAIL_TIMER:
if (tx_timer_deactivate(&pMac->lim.limTimers.gLimAssocFailureTimer) !=
TX_SUCCESS)
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.h b/CORE/MAC/src/pe/lim/limTimerUtils.h
index e623bff..70d2534 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.h
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -82,7 +82,8 @@
eLIM_DEAUTH_ACK_TIMER,
eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER,
eLIM_INSERT_SINGLESHOT_NOA_TIMER,
- eLIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE
+ eLIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE,
+ eLIM_AUTH_RETRY_TIMER
};
#define LIM_DISASSOC_DEAUTH_ACK_TIMEOUT 500
diff --git a/CORE/MAC/src/pe/lim/limTrace.c b/CORE/MAC/src/pe/lim/limTrace.c
index 548a8cc..548c07d 100644
--- a/CORE/MAC/src/pe/lim/limTrace.c
+++ b/CORE/MAC/src/pe/lim/limTrace.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -92,6 +92,7 @@
CASE_RETURN_STRING(eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER);
CASE_RETURN_STRING(eLIM_INSERT_SINGLESHOT_NOA_TIMER);
CASE_RETURN_STRING(eLIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE);
+ CASE_RETURN_STRING(eLIM_AUTH_RETRY_TIMER);
default:
return( "UNKNOWN" );
break;
diff --git a/CORE/MAC/src/pe/lim/limTypes.h b/CORE/MAC/src/pe/lim/limTypes.h
index 9bec0dd..7b15b9e 100644
--- a/CORE/MAC/src/pe/lim/limTypes.h
+++ b/CORE/MAC/src/pe/lim/limTypes.h
@@ -676,7 +676,8 @@
tSirRetStatus limPopulateMacHeader(tpAniSirGlobal, tANI_U8*, tANI_U8, tANI_U8, tSirMacAddr,tSirMacAddr);
tSirRetStatus limSendProbeReqMgmtFrame(tpAniSirGlobal, tSirMacSSid *, tSirMacAddr, tANI_U8, tSirMacAddr, tANI_U32, tANI_U32, tANI_U8 *);
void limSendProbeRspMgmtFrame(tpAniSirGlobal, tSirMacAddr, tpAniSSID, short, tANI_U8, tpPESession, tANI_U8);
-void limSendAuthMgmtFrame(tpAniSirGlobal, tSirMacAuthFrameBody *, tSirMacAddr, tANI_U8,tpPESession);
+void limSendAuthMgmtFrame(tpAniSirGlobal, tSirMacAuthFrameBody *, tSirMacAddr,
+ tANI_U8, tpPESession , tAniBool);
void limSendAssocReqMgmtFrame(tpAniSirGlobal, tLimMlmAssocReq *,tpPESession);
void limSendReassocReqMgmtFrame(tpAniSirGlobal, tLimMlmReassocReq *,tpPESession);
#ifdef WLAN_FEATURE_VOWIFI_11R
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index 6ddb939..05b4052 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -1026,6 +1026,10 @@
tx_timer_deactivate(&pMac->lim.limTimers.gLimPeriodicJoinProbeReqTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimPeriodicJoinProbeReqTimer);
+ // Deactivate and delete Auth Retry timer.
+ tx_timer_deactivate(&pMac->lim.limTimers.gLimPeriodicAuthRetryTimer);
+ tx_timer_delete(&pMac->lim.limTimers.gLimPeriodicAuthRetryTimer);
+
// Deactivate and delete Association failure timer.
tx_timer_deactivate(&pMac->lim.limTimers.gLimAssocFailureTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimAssocFailureTimer);
diff --git a/CORE/SYS/legacy/src/utils/src/macTrace.c b/CORE/SYS/legacy/src/utils/src/macTrace.c
index 05e0a9b..c9f5de3 100644
--- a/CORE/SYS/legacy/src/utils/src/macTrace.c
+++ b/CORE/SYS/legacy/src/utils/src/macTrace.c
@@ -838,8 +838,8 @@
CASE_RETURN_STRING(SIR_LIM_DISASSOC_ACK_TIMEOUT);
CASE_RETURN_STRING(SIR_LIM_DEAUTH_ACK_TIMEOUT);
CASE_RETURN_STRING(SIR_LIM_PERIODIC_JOIN_PROBE_REQ_TIMEOUT);
+ CASE_RETURN_STRING(SIR_LIM_AUTH_RETRY_TIMEOUT);
CASE_RETURN_STRING(SIR_LIM_MSG_TYPES_END);
-
default:
return( (tANI_U8*)"UNKNOWN" );
break;