commit f5d60c852407312e1cf85686db79fc11f7792ada
author Peng Xu <pxu@qca.qualcomm.com> Fri Oct 02 17:17:03 2015 -0700
committer Akash Patel <akashp@codeaurora.org> Mon Feb 08 15:50:37 2016 -0800
tree 2b42e33c1799105ea69b58907d7204e0de740a50
parent 05ac7ee5594f8cd5a3fd4a0a522203252ddfeb42

qcacld-3.0: Clean up usage of con_mode

Separate con_mode from adapter mode definition and clean up usage of
con_mode.

CRs-fixed: 917959
Change-Id: Ia058826cdb873558ab8703fcd4f80d37d3f782df

core/hdd/src/wlan_hdd_scan.c

diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c
index 0a13bf6..46c0cfc 100644
--- a/core/hdd/src/wlan_hdd_scan.c
+++ b/core/hdd/src/wlan_hdd_scan.c
@@ -1241,7 +1241,7 @@
 
 	ENTER();
 
-	if (CDF_FTM_MODE == hdd_get_conparam()) {
+	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
@@ -2027,7 +2027,7 @@
 
 	ENTER();
 
-	if (CDF_FTM_MODE == hdd_get_conparam()) {
+	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}
@@ -2302,7 +2302,7 @@
 
 	ENTER();
 
-	if (CDF_FTM_MODE == hdd_get_conparam()) {
+	if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hddLog(LOGE, FL("Command not allowed in FTM mode"));
 		return -EINVAL;
 	}