commit 747e9cea28416f0a7c993b7f750a2acc14add6a0
author Ashish Kumar Dhanotiya <adhanoti@codeaurora.org> Mon Sep 16 12:47:03 2019 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Oct 01 02:11:34 2019 -0700
tree 76c4b2cd2b3432fe8e983154997e6e21d157fcd1
parent 475bbc7207a52028bb464093c90bb04aab2f522c

wlan: Decouple get channel command from extscan ini

Currently there is a check for the gExtscan ini value
within get valid channel command and if gExtscan ini is
disabled, get valid channel command fails.

To address above issue, do not check for the ini value
as the command to get valid channel should be independent
of ini value.

Change-Id: I0cf24b1e96934111c728701b0db0c5f682934acf
CRs-fixed: 2528040

CORE/HDD/src/wlan_hdd_cfg80211.c

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 513add9..c448ba5 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -4746,9 +4746,25 @@
     int ret,len = 0;;
 
     ENTER();
+    ret = wlan_hdd_validate_context(pHddCtx);
+    if (ret)
+        return false;
 
-    if (!wlan_hdd_is_extscan_supported(pAdapter, pHddCtx))
-        return -EINVAL;
+    if (!pAdapter) {
+        hddLog(VOS_TRACE_LEVEL_DEBUG, FL("Invalid adapter"));
+        return false;
+    }
+
+    if (pAdapter->device_mode != WLAN_HDD_INFRA_STATION) {
+        hddLog(VOS_TRACE_LEVEL_DEBUG,
+               FL("ext scans only supported on STA ifaces"));
+        return false;
+    }
+
+    if (VOS_FTM_MODE == hdd_get_conparam()) {
+        hddLog(VOS_TRACE_LEVEL_DEBUG, FL("Command not allowed in FTM mode"));
+        return false;
+    }
 
     if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX,
                   data, dataLen,