From da8a7e60e5498893d410a67866174fce08fd7133 Mon Sep 17 00:00:00 2001 From: Wu Gao Date: Tue, 30 Apr 2019 11:45:52 +0800 Subject: [PATCH] qcacmn: Cleanup CONFIG_MCL in spectral scan Use new macro "SPECTRAL_MODULIZED_ENABLE" to replace "CONFIG_MCL" and "CONFIG_WIN" in spectral scan component. Change-Id: Ib0167fa7b7cb08efde8d690f24eff85dd21897a1 CRs-Fixed: 2444204 --- init_deinit/dispatcher/src/dispatcher_init_deinit.c | 4 ++-- spectral/core/spectral_common.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/init_deinit/dispatcher/src/dispatcher_init_deinit.c b/init_deinit/dispatcher/src/dispatcher_init_deinit.c index 9a5083445a47..8d3d2d7d8e8c 100644 --- a/init_deinit/dispatcher/src/dispatcher_init_deinit.c +++ b/init_deinit/dispatcher/src/dispatcher_init_deinit.c @@ -259,7 +259,7 @@ static QDF_STATUS dispatcher_regulatory_pdev_open(struct wlan_objmgr_pdev } #ifdef WLAN_CONV_SPECTRAL_ENABLE -#ifdef CONFIG_WIN +#ifdef SPECTRAL_MODULIZED_ENABLE QDF_STATUS dispatcher_register_spectral_pdev_open_handler( spectral_pdev_open_handler handler) { @@ -566,7 +566,7 @@ static QDF_STATUS dispatcher_splitmac_deinit(void) #endif /* WLAN_SUPPORT_SPLITMAC */ #ifdef WLAN_CONV_SPECTRAL_ENABLE -#ifdef CONFIG_MCL +#ifndef SPECTRAL_MODULIZED_ENABLE static QDF_STATUS dispatcher_spectral_init(void) { return wlan_spectral_init(); diff --git a/spectral/core/spectral_common.c b/spectral/core/spectral_common.c index d70bfbdbd5b9..66604fd52634 100644 --- a/spectral/core/spectral_common.c +++ b/spectral/core/spectral_common.c @@ -66,13 +66,13 @@ spectral_get_vdev(struct wlan_objmgr_pdev *pdev) return vdev; } -#ifndef CONFIG_MCL +#ifdef SPECTRAL_MODULIZED_ENABLE /** * spectral_register_cfg80211_handlers() - Register spectral cfg80211 handlers * @pdev: Pointer to pdev * * Register spectral cfg80211 handlers - * Handlers can be different for WIN and MCL + * Handlers can be different depending on whether spectral modulized or not * * Return: None */