commit 97ea095d85110aeb4c6ccf03d8cdad0ec201dcf0
author Hanumantha Reddy Pothula <c_hpothu@qti.qualcomm.com> Fri Oct 09 11:29:39 2015 +0530
committer Satyanarayana Dash <sadash@codeaurora.org> Tue Oct 13 15:58:20 2015 +0530
tree 771ec15e607bdbf2001e327102aa57cdd95f8cc9
parent 3b68193c4f2458025964f5f9909e92a7863edfad

wlan: Do passive to active channel conversion based on ini parameter

Based on ini parameter, gActivePassiveChCon,value convert active to
passive channel conversion. By default this parameter is set to 1,
so that active to passive conversion is enabled by default.

Change-Id: I9cf6d6869796c1593e669f0fdbdb63bd011b9d3e
CRs-Fixed: 916151

CORE/MAC/inc/wniCfg.h

diff --git a/CORE/MAC/inc/wniCfg.h b/CORE/MAC/inc/wniCfg.h
index 7435f0f..89354c2 100644
--- a/CORE/MAC/inc/wniCfg.h
+++ b/CORE/MAC/inc/wniCfg.h
@@ -1895,7 +1895,7 @@
 
 #define WNI_CFG_ACTIVE_PASSIVE_CON_MIN 0
 #define WNI_CFG_ACTIVE_PASSIVE_CON_MAX 1
-#define WNI_CFG_ACTIVE_PASSIVE_CON_DEF 0
+#define WNI_CFG_ACTIVE_PASSIVE_CON_DEF 1
 
 #define WNI_CFG_EXT_SCAN_CONC_MODE_MIN    0
 #define WNI_CFG_EXT_SCAN_CONC_MODE_MAX    2

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 8b81c13..195d209 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
@@ -669,6 +669,7 @@
     tANI_U32 i;
     tANI_U8  channelPair[WNI_CFG_SCAN_CONTROL_LIST_LEN];
     tANI_U32 len = WNI_CFG_SCAN_CONTROL_LIST_LEN;
+
     if (wlan_cfgGetStr(pMac, WNI_CFG_SCAN_CONTROL_LIST, channelPair, &len)
                     != eSIR_SUCCESS)
     {
@@ -739,6 +740,16 @@
 {
 
     tANI_BOOLEAN passiveToActive = TRUE;
+    tANI_U32 cfgVal;
+
+    if (eSIR_SUCCESS == wlan_cfgGetInt(pMac, WNI_CFG_ACTIVE_PASSIVE_CON,
+                                        &cfgVal))
+    {
+        limLog(pMac, LOG1,  FL("WNI_CFG_ACTIVE_PASSIVE_CON: %d"), cfgVal);
+        if (!cfgVal)
+           return;
+    }
+
     if ((1 <= channelNum) && (165 >= channelNum))
     {
        if (eANI_BOOLEAN_TRUE == limIsconnectedOnDFSChannel(channelNum))

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

diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.c b/CORE/MAC/src/pe/lim/limTimerUtils.c
index f4bed14..ee1f6b0 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.c
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.c
@@ -677,7 +677,8 @@
         goto err_timer;
     }
 
-    if (eSIR_SUCCESS == wlan_cfgGetInt(pMac, WNI_CFG_ACTIVE_PASSIVE_CON,
+    cfgValue = WNI_CFG_ACTIVE_PASSIVE_CON_MAX;
+    if (eSIR_SUCCESS != wlan_cfgGetInt(pMac, WNI_CFG_ACTIVE_PASSIVE_CON,
                                       &cfgValue))
     {
         limLog(pMac, LOGP,