diff --git a/global_lmac_if/src/wlan_global_lmac_if.c b/global_lmac_if/src/wlan_global_lmac_if.c index 934148572478..d02bfae42aa5 100644 --- a/global_lmac_if/src/wlan_global_lmac_if.c +++ b/global_lmac_if/src/wlan_global_lmac_if.c @@ -22,8 +22,9 @@ #include "wlan_lmac_if_def.h" #include "wlan_lmac_if_api.h" #include "wlan_global_lmac_if_api.h" +#ifdef WLAN_CONV_SPECTRAL_ENABLE #include - +#endif /* Function pointer to call DA/OL specific tx_ops registration function */ QDF_STATUS (*wlan_global_lmac_if_tx_ops_register[MAX_DEV_TYPE]) (struct wlan_lmac_if_tx_ops *tx_ops); diff --git a/init_deinit/dispatcher/src/dispatcher_init_deinit.c b/init_deinit/dispatcher/src/dispatcher_init_deinit.c index baac057bf138..1bc419a03856 100644 --- a/init_deinit/dispatcher/src/dispatcher_init_deinit.c +++ b/init_deinit/dispatcher/src/dispatcher_init_deinit.c @@ -67,8 +67,9 @@ #ifdef WLAN_SUPPORT_SPLITMAC #include #endif - +#ifdef WLAN_CONV_SPECTRAL_ENABLE #include +#endif #ifdef WLAN_SUPPORT_FILS #include #endif @@ -349,6 +350,7 @@ static QDF_STATUS dispatcher_regulatory_pdev_open(struct wlan_objmgr_pdev return regulatory_pdev_open(pdev); } +#ifdef WLAN_CONV_SPECTRAL_ENABLE #ifdef CONFIG_WIN QDF_STATUS dispatcher_register_spectral_pdev_open_handler( spectral_pdev_open_handler handler) @@ -376,6 +378,18 @@ static QDF_STATUS dispatcher_spectral_pdev_open(struct wlan_objmgr_pdev return spectral_pdev_open(pdev); } +static QDF_STATUS dispatcher_spectral_pdev_close(struct wlan_objmgr_pdev *pdev) +{ + return QDF_STATUS_SUCCESS; +} +#endif +#else +static QDF_STATUS dispatcher_spectral_pdev_open(struct wlan_objmgr_pdev + *pdev) +{ + return QDF_STATUS_SUCCESS; +} + static QDF_STATUS dispatcher_spectral_pdev_close(struct wlan_objmgr_pdev *pdev) { return QDF_STATUS_SUCCESS; @@ -755,6 +769,7 @@ static QDF_STATUS dispatcher_splitmac_deinit(void) } #endif /* WLAN_SUPPORT_SPLITMAC */ +#ifdef WLAN_CONV_SPECTRAL_ENABLE #ifdef CONFIG_MCL static QDF_STATUS dispatcher_spectral_init(void) { @@ -775,7 +790,18 @@ static QDF_STATUS dispatcher_spectral_deinit(void) { return QDF_STATUS_SUCCESS; } -#endif /*CONFIG_MCL*/ +#endif +#else +static QDF_STATUS dispatcher_spectral_init(void) +{ + return QDF_STATUS_SUCCESS; +} + +static QDF_STATUS dispatcher_spectral_deinit(void) +{ + return QDF_STATUS_SUCCESS; +} +#endif #ifdef DIRECT_BUF_RX_ENABLE static QDF_STATUS dispatcher_dbr_psoc_enable(struct wlan_objmgr_psoc *psoc) diff --git a/os_if/linux/spectral/inc/os_if_spectral_netlink.h b/os_if/linux/spectral/inc/os_if_spectral_netlink.h index 0f7379ded3a8..46b9af0072b6 100644 --- a/os_if/linux/spectral/inc/os_if_spectral_netlink.h +++ b/os_if/linux/spectral/inc/os_if_spectral_netlink.h @@ -51,8 +51,13 @@ extern struct net init_net; * * Return: None */ +#ifdef WLAN_CONV_SPECTRAL_ENABLE void os_if_spectral_netlink_init(struct wlan_objmgr_pdev *pdev); - +#else +static inline void os_if_spectral_netlink_init(struct wlan_objmgr_pdev *pdev) +{ +} +#endif /** * os_if_spectral_prep_skb() - Prepare socket buffer * @pdev : Pointer to pdev diff --git a/target_if/spectral/target_if_spectral.h b/target_if/spectral/target_if_spectral.h index 914dd394af73..31627f7f6eb5 100644 --- a/target_if/spectral/target_if_spectral.h +++ b/target_if/spectral/target_if_spectral.h @@ -905,6 +905,7 @@ struct target_if_samp_msg_params { struct ath_softc *sc; }; +#ifdef WLAN_CONV_SPECTRAL_ENABLE /** * target_if_spectral_dump_fft() - Dump Spectral FFT * @pfft: Pointer to Spectral Phyerr FFT @@ -1607,4 +1608,5 @@ target_if_consume_spectral_report_gen3( #undef __ATTRIB_PACK #endif +#endif /* WLAN_CONV_SPECTRAL_ENABLE */ #endif /* _TARGET_IF_SPECTRAL_H_ */ diff --git a/target_if/spectral/target_if_spectral_phyerr.c b/target_if/spectral/target_if_spectral_phyerr.c index d9d08207539a..9f6c5276b553 100644 --- a/target_if/spectral/target_if_spectral_phyerr.c +++ b/target_if/spectral/target_if_spectral_phyerr.c @@ -34,7 +34,7 @@ #include extern int spectral_debug_level; -#if WLAN_SPECTRAL_ENABLE +#ifdef WLAN_CONV_SPECTRAL_ENABLE /** * target_if_print_buf() - Prints given buffer for given length @@ -1625,4 +1625,4 @@ int target_if_spectral_process_report_gen3( qdf_export_symbol(target_if_spectral_process_report_gen3); /* END of spectral GEN III HW specific functions */ -#endif /* WLAN_SPECTRAL_ENABLE */ +#endif /* WLAN_CONV_SPECTRAL_ENABLE */