Merge "wlan: Set max size of beacon and probe resp template to 384" into wlan-driver.lnx.1.0
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
index 6af7036..bc6cb0a 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -524,6 +524,16 @@
// Initialize max timer too
limDeactivateAndChangeTimer(pMac, eLIM_MAX_CHANNEL_TIMER);
+ if (tx_timer_activate(&pMac->lim.limTimers.gLimMaxChannelTimer) !=
+ TX_SUCCESS)
+ {
+ limLog(pMac, LOGE, FL("could not start max channel timer"));
+ limDeactivateAndChangeTimer(pMac, eLIM_MIN_CHANNEL_TIMER);
+ limDeactivateAndChangeTimer(pMac, eLIM_MAX_CHANNEL_TIMER);
+ limSendHalEndScanReq(pMac, channelNum,
+ eLIM_HAL_END_SCAN_WAIT_STATE);
+ return;
+ }
#if defined WLAN_FEATURE_VOWIFI
}
else
@@ -4040,6 +4050,11 @@
pMac->lim.limTimers.gLimPeriodicProbeReqTimer.sessionId = 0xff;
limDeactivateAndChangeTimer(pMac, eLIM_MIN_CHANNEL_TIMER);
limDeactivateAndChangeTimer(pMac, eLIM_PERIODIC_PROBE_REQ_TIMER);
+ /*
+ * Deactivate Max Channel timer as well since no probe resp/beacons
+ * are received.
+ */
+ limDeactivateAndChangeTimer(pMac, eLIM_MAX_CHANNEL_TIMER);
pMac->lim.probeCounter = 0;
if (pMac->lim.gLimCurrentScanChannelId <=
(tANI_U32)(pMac->lim.gpLimMlmScanReq->channelList.numChannels - 1))
diff --git a/CORE/MAC/src/pe/lim/limScanResultUtils.c b/CORE/MAC/src/pe/lim/limScanResultUtils.c
index 9937f38..90b5ae0 100644
--- a/CORE/MAC/src/pe/lim/limScanResultUtils.c
+++ b/CORE/MAC/src/pe/lim/limScanResultUtils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2014, 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2014, 2016-2018 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -80,18 +80,8 @@
* Beacon/Probe Response is received during active scanning.
* Deactivate MIN channel timer if running.
*/
-
limDeactivateAndChangeTimer(pMac,eLIM_MIN_CHANNEL_TIMER);
- if (tx_timer_activate(&pMac->lim.limTimers.gLimMaxChannelTimer)
- == TX_TIMER_ERROR)
- {
- /// Could not activate max channel timer.
- // Log error
- limLog(pMac,LOGP, FL("could not activate max channel timer"));
- limCompleteMlmScan(pMac, eSIR_SME_RESOURCES_UNAVAILABLE);
- return TX_TIMER_ERROR;
- }
}
return eSIR_SUCCESS;
} /*** end limDeactivateMinChannelTimerDuringScan() ***/