commit 551984f70abf9fc8ae72573a859ea0bdc1bc6a99
author Madan Mohan Koyyalamudi <c_mkoyya@qca.qualcomm.com> Wed Nov 28 15:37:40 2012 -0800
committer Mohit Khanna <mkhanna@qca.qualcomm.com> Tue Dec 04 12:13:27 2012 -0800
tree a3e0a496a50ba3d5fff30bd122f0405a1cd74375
parent 0e4955a5f9d9252789c9bc047bac298144caeab2

wlan: Use min + max channel time to calculate total scan duration for use in NOA duration calculation.

Use min + max channel time to calculate total scan duration for use in
NOA duration calculation

Change-Id: I9e107d574a4f6c2025fbbb535e67bdb7f2a5ce75
CR-Fixed: 425096

CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c

diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
index ce95cb4..d1c27e7 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
@@ -1885,8 +1885,10 @@
         pMac->lim.gLimSystemInScanLearnMode = 1;
 
 #ifdef WLAN_FEATURE_P2P
+        /* Use min + max channel time to calculate the total duration of scan.
+         * Adding an overhead of 5ms to account for the scan messaging delays */
         pMac->lim.gTotalScanDuration = 
-                    pMac->lim.gpLimMlmScanReq->maxChannelTime*
+                    (pMac->lim.gpLimMlmScanReq->minChannelTime + pMac->lim.gpLimMlmScanReq->maxChannelTime + 5)*
                     pMac->lim.gpLimMlmScanReq->channelList.numChannels;
 #endif
         limSetScanMode(pMac);