From ded48e034cfa862b76f6ac93367d24d2656d02e8 Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Tue, 7 Jan 2014 16:28:29 -0800 Subject: qcacld: fix for SETSCANCHANNELTIME value is not taking effect Roaming firmware was uses single value for dwell time and not max and min. Host was passing two values and this was causing wrong value to be taken and correct value to be dropped. Change-Id: Idad06453a221d70c6e37638315bb7d072e1bc6a6 CRs-Fixed: 595262 --- CORE/SERVICES/WMA/wma.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c index b6b69b2a5cb9..e4f848f5039e 100644 --- a/CORE/SERVICES/WMA/wma.c +++ b/CORE/SERVICES/WMA/wma.c @@ -4014,12 +4014,14 @@ v_VOID_t wma_roam_scan_fill_scan_params(tp_wma_handle wma_handle, tpAniSirGlobal /* NeighborScanChannelMinTime = SETROAMSCANCHANNELMINTIME and gNeighborScanChannelMinTime */ if (roam_req->HomeAwayTime > (2 * WMA_ROAM_SCAN_CHANNEL_SWITCH_TIME)) { burst_duration = roam_req->HomeAwayTime - 2 * WMA_ROAM_SCAN_CHANNEL_SWITCH_TIME; - min_scan_time = min(roam_req->NeighborScanChannelMinTime, burst_duration); max_scan_time = min(roam_req->NeighborScanChannelMaxTime, burst_duration); } else { - min_scan_time = roam_req->NeighborScanChannelMinTime; - burst_duration = max_scan_time = roam_req->NeighborScanChannelMaxTime; + burst_duration = max_scan_time = roam_req->NeighborScanChannelMaxTime; } + /* ROME cld firmware have single value and not min, max + * therefore setting both values to same thing. + */ + min_scan_time = max_scan_time; nprobes = roam_req->nProbes; scan_params->dwell_time_active = min_scan_time; -- cgit v1.2.3