summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKiran Kumar Lokere <klokere@qca.qualcomm.com>2014-01-20 17:06:59 -0800
committerPrakash Dhavali <pdhavali@qca.qualcomm.com>2014-01-26 21:37:01 -0800
commitfcd4c8f51bc68a5ea53b82a7aba4bc6f812be43b (patch)
tree7a9818ed4179d527356ba3bc31edda0e9a24f982
parent85f8fd1d1984774e22d2a9197fcc7825916e0387 (diff)
Fix the incorrect channel number for DFS CAC timeout check.
Check the SAP current channel number for DFS CAC time instead of checking for the DFS target channel, DFS target channel do not have any value when SAP started on DFS channel, it will have valid channel number only when DFS channel switch happens. Change-Id: Ib02becf35afcbe5bacb05d192aacafd216c11601 CRs-Fixed: 599745
-rw-r--r--CORE/SAP/src/sapFsm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/CORE/SAP/src/sapFsm.c b/CORE/SAP/src/sapFsm.c
index 9f18bfd09581..99efd040e4aa 100644
--- a/CORE/SAP/src/sapFsm.c
+++ b/CORE/SAP/src/sapFsm.c
@@ -1961,7 +1961,7 @@ void sapDfsCacTimerCallback(void *data)
*/
VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_DEBUG,
"%s[%d]: Sending eSAP_DFS_CHANNEL_CAC_END for target_channel = %d",
- __func__,__LINE__, sapContext->SapDfsInfo.target_channel);
+ __func__,__LINE__, sapContext->channel);
sapEvent.event = eSAP_DFS_CHANNEL_CAC_END;
sapEvent.params = 0;
sapEvent.u1 = 0;
@@ -2009,13 +2009,13 @@ int sapStartDfsCacTimer(ptSapContext sapContext)
vos_nv_getRegDomainFromCountryCode(&regDomain,
sapContext->csrRoamProfile.countryCode, COUNTRY_QUERY);
if ((regDomain == REGDOMAIN_ETSI) &&
- (IS_ETSI_WEATHER_CH(sapContext->SapDfsInfo.target_channel)))
+ (IS_ETSI_WEATHER_CH(sapContext->channel)))
{
cacTimeOut = ETSI_WEATHER_CH_CAC_TIMEOUT;
}
VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_DEBUG,
"%s[%d]: SAP_DFS_CHANNEL_CAC_START on CH - %d, CAC TIMEOUT - %d sec",
- __func__, __LINE__, sapContext->SapDfsInfo.target_channel, cacTimeOut/1000);
+ __func__, __LINE__, sapContext->channel, cacTimeOut/1000);
vos_timer_init(&sapContext->SapDfsInfo.sap_dfs_cac_timer,
VOS_TIMER_TYPE_SW,