wlan: During pre association phase unicast probe requst is sent.
If there is no probe resp due to GO NOA then retry the probe request
During pre association phase unicast probe requst is sent .
If there is no probe resp due to GO NOA then retry the probe request
Change-Id: I53a8f7034e8ce8dd9925bd6567d096926dcfacf5
CR-Fixed: 424212
diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index 3026558..c352d7e 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -1215,6 +1215,7 @@
*/
case SIR_LIM_REASSOC_FAIL_TIMEOUT:
case SIR_LIM_JOIN_FAIL_TIMEOUT:
+ case SIR_LIM_PERIODIC_JOIN_PROBE_REQ_TIMEOUT:
case SIR_LIM_ASSOC_FAIL_TIMEOUT:
case SIR_LIM_AUTH_FAIL_TIMEOUT:
case SIR_LIM_ADDTS_RSP_TIMEOUT:
diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.c b/CORE/MAC/src/pe/lim/limAssocUtils.c
index 5afb3e8..8b50be7 100644
--- a/CORE/MAC/src/pe/lim/limAssocUtils.c
+++ b/CORE/MAC/src/pe/lim/limAssocUtils.c
@@ -2834,6 +2834,8 @@
// Deactivate Join Failure timer
limDeactivateAndChangeTimer(pMac, eLIM_JOIN_FAIL_TIMER);
+ // Deactivate Periodic Join timer
+ limDeactivateAndChangeTimer(pMac, eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER);
// Update Beacon Interval at CFG database
diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
index 4aa56a5..280be96 100644
--- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
+++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
@@ -1647,6 +1647,7 @@
case SIR_LIM_MAX_CHANNEL_TIMEOUT:
case SIR_LIM_PERIODIC_PROBE_REQ_TIMEOUT:
case SIR_LIM_JOIN_FAIL_TIMEOUT:
+ case SIR_LIM_PERIODIC_JOIN_PROBE_REQ_TIMEOUT:
case SIR_LIM_AUTH_FAIL_TIMEOUT:
case SIR_LIM_AUTH_RSP_TIMEOUT:
case SIR_LIM_ASSOC_FAIL_TIMEOUT:
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
index d1c27e7..9f7c5a7 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
@@ -84,6 +84,7 @@
static void limProcessAuthFailureTimeout(tpAniSirGlobal);
static void limProcessAuthRspTimeout(tpAniSirGlobal, tANI_U32);
static void limProcessAssocFailureTimeout(tpAniSirGlobal, tANI_U32);
+static void limProcessPeriodicJoinProbeReqTimer(tpAniSirGlobal);
static void limProcessMlmRemoveKeyReq(tpAniSirGlobal pMac, tANI_U32 * pMsgBuf);
void
@@ -141,6 +142,8 @@
case SIR_LIM_PERIODIC_PROBE_REQ_TIMEOUT:
limProcessPeriodicProbeReqTimer(pMac); break;
case SIR_LIM_JOIN_FAIL_TIMEOUT: limProcessJoinFailureTimeout(pMac); break;
+ case SIR_LIM_PERIODIC_JOIN_PROBE_REQ_TIMEOUT:
+ limProcessPeriodicJoinProbeReqTimer(pMac); break;
case SIR_LIM_AUTH_FAIL_TIMEOUT: limProcessAuthFailureTimeout(pMac); break;
case SIR_LIM_AUTH_RSP_TIMEOUT: limProcessAuthRspTimeout(pMac, Msg->bodyval); break;
case SIR_LIM_ASSOC_FAIL_TIMEOUT: limProcessAssocFailureTimeout(pMac, Msg->bodyval); break;
@@ -3768,7 +3771,8 @@
// 'Change' timer for future activations
limDeactivateAndChangeTimer(pMac, eLIM_JOIN_FAIL_TIMER);
-
+ // Change Periodic probe req timer for future activation
+ limDeactivateAndChangeTimer(pMac, eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER);
/**
* Issue MLM join confirm with timeout reason code
*/
@@ -3813,6 +3817,59 @@
} /*** limProcessJoinFailureTimeout() ***/
+/**
+ * limProcessPeriodicJoinProbeReqTimer()
+ *
+ *FUNCTION:
+ * This function is called to process periodic probe request
+ * send during joining process.
+ *
+ *LOGIC:
+ *
+ *ASSUMPTIONS:
+ *
+ *NOTE:
+ *
+ * @param pMac Pointer to Global MAC structure
+ * @return None
+ */
+
+static void limProcessPeriodicJoinProbeReqTimer(tpAniSirGlobal pMac)
+{
+ tpPESession psessionEntry;
+ tSirMacSSid ssId;
+
+ if((psessionEntry = peFindSessionBySessionId(pMac, pMac->lim.limTimers.gLimPeriodicJoinProbeReqTimer.sessionId))== NULL)
+ {
+ limLog(pMac, LOGE,FL("session does not exist for given SessionId\n"));
+ return;
+ }
+
+ if((VOS_TRUE == tx_timer_running(&pMac->lim.limTimers.gLimJoinFailureTimer)) &&
+ (psessionEntry->limMlmState == eLIM_MLM_WT_JOIN_BEACON_STATE))
+ {
+ palCopyMemory( pMac->hHdd, ssId.ssId,
+ psessionEntry->ssId.ssId,
+ psessionEntry->ssId.length);
+ ssId.length = psessionEntry->ssId.length;
+
+ limSendProbeReqMgmtFrame( pMac, &ssId,
+ psessionEntry->pLimMlmJoinReq->bssDescription.bssId, psessionEntry->currentOperChannel/*chanNum*/,
+ psessionEntry->selfMacAddr, psessionEntry->dot11mode,
+ psessionEntry->pLimJoinReq->addIEScan.length, psessionEntry->pLimJoinReq->addIEScan.addIEdata);
+
+ limDeactivateAndChangeTimer(pMac, eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER);
+
+ // Activate Join Periodic Probe Req timer
+ if (tx_timer_activate(&pMac->lim.limTimers.gLimPeriodicJoinProbeReqTimer) != TX_SUCCESS)
+ {
+ limLog(pMac, LOGP, FL("could not activate Periodic Join req failure timer\n"));
+ return;
+ }
+ }
+ return;
+} /*** limProcessPeriodicJoinProbeReqTimer() ***/
+
/**
* limProcessAuthFailureTimeout()
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index e8c508b..58b5078 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -3768,14 +3768,6 @@
psessionEntry->selfMacAddr, NULL, NULL) != eSIR_SUCCESS)
goto error;
}
- // Update BSSID at CFG database
-#if 0
- if (cfgSetStr(pMac, WNI_CFG_BSSID, pMac->lim.gpLimMlmJoinReq->bssDescription.bssId,
- sizeof(tSirMacAddr))
- != eSIR_SUCCESS)
- limLog(pMac, LOGP, FL("could not update BSSID at CFG\n"));
-#endif //TO SUPPORT BT-AMP
- //sirCopyMacAddr(psessionEntry->pLimMlmJoinReq->bssDescription.bssId,psessionEntry->bssId);
/* Update the lim global gLimTriggerBackgroundScanDuringQuietBss */
if(wlan_cfgGetInt(pMac, WNI_CFG_TRIG_STA_BK_SCAN, &val) != eSIR_SUCCESS)
@@ -3784,14 +3776,15 @@
// Apply previously set configuration at HW
limApplyConfiguration(pMac, psessionEntry);
/// Wait for Beacon to announce join success
-#if 0
- if (cfgGetStr(pMac, WNI_CFG_SSID, ssId.ssId, &cfgLen) != eSIR_SUCCESS)
- limLog(pMac, LOGP, FL("could not retrive SSID\n"));
-#endif //To SUPPORT BT-AMP
palCopyMemory( pMac->hHdd, ssId.ssId,
psessionEntry->ssId.ssId,
psessionEntry->ssId.length);
ssId.length = psessionEntry->ssId.length;
+
+ limDeactivateAndChangeTimer(pMac, eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER);
+
+ //assign appropriate sessionId to the timer object
+ pMac->lim.limTimers.gLimPeriodicJoinProbeReqTimer.sessionId = psessionEntry->peSessionId;
// include additional IE if there is
limSendProbeReqMgmtFrame( pMac, &ssId,
psessionEntry->pLimMlmJoinReq->bssDescription.bssId, psessionEntry->currentOperChannel/*chanNum*/,
@@ -3810,6 +3803,18 @@
goto error;
}
+#ifdef WLAN_FEATURE_P2P
+ if( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE )
+ {
+ // Activate Join Periodic Probe Req timer
+ if (tx_timer_activate(&pMac->lim.limTimers.gLimPeriodicJoinProbeReqTimer) != TX_SUCCESS)
+ {
+ limLog(pMac, LOGP, FL("could not activate Periodic Join req failure timer\n"));
+ goto error;
+ }
+ }
+#endif
+
return;
error:
if(NULL != psessionEntry)
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.c b/CORE/MAC/src/pe/lim/limTimerUtils.c
index bb3ca44..0dbf0fd 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.c
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.c
@@ -47,6 +47,8 @@
#define LIM_QUIET_BSS_TIMER_TICK 100
// Lim KeepAlive timer default (3000)ms
#define LIM_KEEPALIVE_TIMER_MS 3000
+// Lim JoinProbeRequest Retry timer default (200)ms
+#define LIM_JOIN_PROBE_REQ_TIMER_MS 200
//default beacon interval value used in HB timer interval calculation
#define LIM_HB_TIMER_BEACON_INTERVAL 100
@@ -239,6 +241,19 @@
goto err_timer;
}
+
+ //Send unicast probe req frame every 200 ms
+ if ((tx_timer_create(&pMac->lim.limTimers.gLimPeriodicJoinProbeReqTimer,
+ "Periodic Join Probe Request Timer",
+ limTimerHandler, SIR_LIM_PERIODIC_JOIN_PROBE_REQ_TIMEOUT,
+ SYS_MS_TO_TICKS(LIM_JOIN_PROBE_REQ_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 Join Probe Request timer\n"));
+ goto err_timer;
+ }
#if defined(ANI_OS_TYPE_RTAI_LINUX)
tx_timer_set_expiry_list(&pMac->lim.limTimers.gLimJoinFailureTimer,
LIM_TIMER_EXPIRY_LIST);
@@ -722,6 +737,7 @@
tx_timer_delete(&pMac->lim.limTimers.gLimReassocFailureTimer);
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.gLimQuietBssTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimQuietTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimChannelSwitchTimer);
@@ -1179,6 +1195,26 @@
break;
+ case eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER:
+ if (tx_timer_deactivate(&pMac->lim.limTimers.gLimPeriodicJoinProbeReqTimer)
+ != TX_SUCCESS)
+ {
+ // Could not deactivate periodic join req Times.
+ limLog(pMac, LOGP,
+ FL("Unable to deactivate periodic join request timer\n"));
+ }
+
+ val = SYS_MS_TO_TICKS(LIM_JOIN_PROBE_REQ_TIMER_MS);
+ if (tx_timer_change(&pMac->lim.limTimers.gLimPeriodicJoinProbeReqTimer,
+ val, 0) != TX_SUCCESS)
+ {
+ // Could not change periodic join req times.
+ // Log error
+ limLog(pMac, LOGP, FL("Unable to change periodic join request timer\n"));
+ }
+
+ break;
+
case eLIM_AUTH_FAIL_TIMER:
if (tx_timer_deactivate(&pMac->lim.limTimers.gLimAuthFailureTimer)
!= TX_SUCCESS)
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.h b/CORE/MAC/src/pe/lim/limTimerUtils.h
index 0969475..b0b990d 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.h
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.h
@@ -77,6 +77,7 @@
#endif
eLIM_DISASSOC_ACK_TIMER,
eLIM_DEAUTH_ACK_TIMER,
+ eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER,
};
#define LIM_DISASSOC_DEAUTH_ACK_TIMEOUT 500
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index 7a8d820..95f01ab 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -968,6 +968,10 @@
tx_timer_deactivate(&pMac->lim.limTimers.gLimJoinFailureTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimJoinFailureTimer);
+ // Deactivate and delete Periodic Join Probe Request timer.
+ tx_timer_deactivate(&pMac->lim.limTimers.gLimPeriodicJoinProbeReqTimer);
+ tx_timer_delete(&pMac->lim.limTimers.gLimPeriodicJoinProbeReqTimer);
+
// Deactivate and delete Association failure timer.
tx_timer_deactivate(&pMac->lim.limTimers.gLimAssocFailureTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimAssocFailureTimer);