summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarada Prasanna Garnayak <c_sgarna@qti.qualcomm.com>2015-12-02 20:45:25 +0530
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2015-12-04 16:21:40 +0530
commit5d0c56e908beca321ef78b7af7b20a210e15f3ed (patch)
tree3a7c87ffe9c5fda1ea3064ed7774e9a0239e0226
parentf78d94580efd6cd60d53ad5baa3f31342a97df64 (diff)
qcacld-2.0: enable unsafe channel and dfs nol for mdmfermium
Enable store and retrieve of WiFi unsafe Channel list for mdmfermium target. It adds support WiFi unsafe Channel list for LTE-WiFi coexistence. Enable store and retrieve of DFS Nol list for mdmfermium target. DFS list is needed on Radar detection. CRs-Fixed: 947280 Change-Id: I8a41facd01b52bcc932e4a25bca97014b0d72857
-rw-r--r--CORE/HDD/src/wlan_hdd_hostapd.c8
-rwxr-xr-xCORE/HDD/src/wlan_hdd_main.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index e0ab31e9df33..2593de3a3b12 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -80,7 +80,7 @@
#include "wniCfgAp.h"
#include "wlan_hdd_misc.h"
#include <vos_utils.h>
-#if defined CONFIG_CNSS
+#if defined(CONFIG_CNSS) || defined(CONFIG_CNSS_SDIO)
#include <net/cnss.h>
#endif
@@ -1181,7 +1181,7 @@ VOS_STATUS hdd_hostapd_SAPEventCB( tpSap_Event pSapEvent, v_PVOID_t usrDataForCa
v_U8_t cc_len = WLAN_SVC_COUNTRY_CODE_LEN;
hdd_adapter_t *con_sap_adapter;
VOS_STATUS status = VOS_STATUS_SUCCESS;
-#if defined CONFIG_CNSS
+#if defined(CONFIG_CNSS) || defined(CONFIG_CNSS_SDIO)
int ret = 0;
#endif
@@ -2013,7 +2013,7 @@ VOS_STATUS hdd_hostapd_SAPEventCB( tpSap_Event pSapEvent, v_PVOID_t usrDataForCa
case eSAP_DFS_NOL_GET:
hddLog(VOS_TRACE_LEVEL_INFO,
FL("Received eSAP_DFS_NOL_GET event"));
-#if defined CONFIG_CNSS
+#if defined(CONFIG_CNSS) || defined(CONFIG_CNSS_SDIO)
/* get the dfs nol from cnss */
ret = cnss_wlan_get_dfs_nol(
pSapEvent->sapevt.sapDfsNolInfo.pDfsList,
@@ -2035,7 +2035,7 @@ VOS_STATUS hdd_hostapd_SAPEventCB( tpSap_Event pSapEvent, v_PVOID_t usrDataForCa
#endif
case eSAP_DFS_NOL_SET:
hddLog(VOS_TRACE_LEVEL_INFO, FL("Received eSAP_DFS_NOL_SET event"));
-#if defined CONFIG_CNSS
+#if defined(CONFIG_CNSS) || defined(CONFIG_CNSS_SDIO)
/* set the dfs nol to cnss */
ret = cnss_wlan_set_dfs_nol(
pSapEvent->sapevt.sapDfsNolInfo.pDfsList,
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 1b117eacfc98..faef5f6b5f41 100755
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -105,7 +105,7 @@
#include "wlan_qct_wda.h"
#include "wlan_hdd_tdls.h"
#ifdef FEATURE_WLAN_CH_AVOID
-#ifdef CONFIG_CNSS
+#if defined(CONFIG_CNSS) || defined(CONFIG_CNSS_SDIO)
#include <net/cnss.h>
#endif
#include "regdomain_common.h"
@@ -12145,7 +12145,7 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc)
tSmeThermalParams thermalParam;
tSirTxPowerLimit *hddtxlimit;
#ifdef FEATURE_WLAN_CH_AVOID
-#ifdef CONFIG_CNSS
+#if defined(CONFIG_CNSS) || defined(CONFIG_CNSS_SDIO)
uint16_t unsafe_channel_count;
int unsafeChannelIndex;
#endif
@@ -12550,7 +12550,7 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc)
}
#ifdef FEATURE_WLAN_CH_AVOID
-#ifdef CONFIG_CNSS
+#if defined(CONFIG_CNSS) || defined(CONFIG_CNSS_SDIO)
cnss_get_wlan_unsafe_channel(pHddCtx->unsafe_channel_list,
&(pHddCtx->unsafe_channel_count),
sizeof(v_U16_t) * NUM_20MHZ_RF_CHANNELS);
@@ -14176,7 +14176,7 @@ void hdd_ch_avoid_cb
}
}
-#ifdef CONFIG_CNSS
+#if defined(CONFIG_CNSS) || defined(CONFIG_CNSS_SDIO)
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s : number of unsafe channels is %d ",
__func__, hdd_ctxt->unsafe_channel_count);