commit 817a5d01db3c68e6c8a42024df149a66d579dfe0
author Linux Build Service Account <lnxbuild@localhost> Sat Nov 23 07:20:36 2019 -0800
committer Linux Build Service Account <lnxbuild@localhost> Sat Nov 23 07:20:36 2019 -0800
tree 76c4b2cd2b3432fe8e983154997e6e21d157fcd1
parent b5e7bab10c0ff2f02f4cffba23071259795e275d
parent 747e9cea28416f0a7c993b7f750a2acc14add6a0

Merge 747e9cea28416f0a7c993b7f750a2acc14add6a0 on remote branch

Change-Id: I7014453cabadcd7d71ddef854feb6e5300bbc579

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,