From 6315ce5dd1f8db3c23ef1a1ff108d5be687f295b Mon Sep 17 00:00:00 2001 From: Santosh Anbu Date: Mon, 3 Aug 2020 17:15:15 +0530 Subject: [PATCH] qcacmn: Add dependency of blacklist manager macro at WMI layer The blacklist manager macro is connection manager specific, whereas the macros used at WMI is dependent on roam offload. Hence mark of dependency of FEATURE_BLACKLIST_MGR on WLAN_FEATURE_ROAM_OFFLOAD. Change-Id: If48b701a450d34915d57780a274311aa2590c89a CRs-Fixed: 2746160 --- wmi/inc/wmi_unified_priv.h | 4 ++-- wmi/inc/wmi_unified_sta_api.h | 2 +- wmi/src/wmi_unified_sta_api.c | 2 +- wmi/src/wmi_unified_sta_tlv.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h index e4c5ff9ea96c..080b9ddccf33 100644 --- a/wmi/inc/wmi_unified_priv.h +++ b/wmi/inc/wmi_unified_priv.h @@ -429,7 +429,7 @@ QDF_STATUS (*send_d0wow_disable_cmd)(wmi_unified_t wmi_handle, uint8_t mac_id); #endif -#ifdef FEATURE_BLACKLIST_MGR +#if defined(WLAN_FEATURE_ROAM_OFFLOAD) && defined(FEATURE_BLACKLIST_MGR) QDF_STATUS (*send_reject_ap_list_cmd)(struct wmi_unified *wmi_handle, struct reject_ap_params *reject_params); @@ -2747,7 +2747,7 @@ void wmi_policy_mgr_attach_tlv(struct wmi_unified *wmi_handle) } #endif -#ifdef FEATURE_BLACKLIST_MGR +#if defined(WLAN_FEATURE_ROAM_OFFLOAD) && defined(FEATURE_BLACKLIST_MGR) void wmi_blacklist_mgr_attach_tlv(struct wmi_unified *wmi_handle); #else static inline diff --git a/wmi/inc/wmi_unified_sta_api.h b/wmi/inc/wmi_unified_sta_api.h index 9d698979c8ed..ffd6d35e628d 100644 --- a/wmi/inc/wmi_unified_sta_api.h +++ b/wmi/inc/wmi_unified_sta_api.h @@ -72,7 +72,7 @@ QDF_STATUS wmi_unified_vdev_set_gtx_cfg_cmd(wmi_unified_t wmi_handle, uint32_t if_id, struct wmi_gtx_config *gtx_info); -#ifdef FEATURE_BLACKLIST_MGR +#if defined(WLAN_FEATURE_ROAM_OFFLOAD) && defined(FEATURE_BLACKLIST_MGR) /** * wmi_unified_send_reject_ap_list() - send the reject ap list maintained by * BLM to FW for roaming cases. diff --git a/wmi/src/wmi_unified_sta_api.c b/wmi/src/wmi_unified_sta_api.c index f5caf012a6ef..5fa393c37003 100644 --- a/wmi/src/wmi_unified_sta_api.c +++ b/wmi/src/wmi_unified_sta_api.c @@ -181,7 +181,7 @@ QDF_STATUS wmi_extract_vdev_tdls_ev_param(wmi_unified_t wmi_handle, } #endif /* FEATURE_WLAN_TDLS */ -#ifdef FEATURE_BLACKLIST_MGR +#if defined(WLAN_FEATURE_ROAM_OFFLOAD) && defined(FEATURE_BLACKLIST_MGR) QDF_STATUS wmi_unified_send_reject_ap_list(struct wmi_unified *wmi_handle, struct reject_ap_params *reject_params) diff --git a/wmi/src/wmi_unified_sta_tlv.c b/wmi/src/wmi_unified_sta_tlv.c index 778857bae4c0..224893dd6a6e 100644 --- a/wmi/src/wmi_unified_sta_tlv.c +++ b/wmi/src/wmi_unified_sta_tlv.c @@ -1098,7 +1098,7 @@ static QDF_STATUS send_set_base_macaddr_indicate_cmd_tlv(wmi_unified_t wmi_handl return 0; } -#ifdef FEATURE_BLACKLIST_MGR +#if defined(WLAN_FEATURE_ROAM_OFFLOAD) && defined(FEATURE_BLACKLIST_MGR) static WMI_BSSID_DISALLOW_LIST_TYPE wmi_get_wmi_reject_ap_type(enum blm_reject_ap_type reject_ap_type)