diff --git a/components/blacklist_mgr/dispatcher/inc/wlan_blm_api.h b/components/blacklist_mgr/dispatcher/inc/wlan_blm_api.h index ff9c1fe049..75ba78d04e 100644 --- a/components/blacklist_mgr/dispatcher/inc/wlan_blm_api.h +++ b/components/blacklist_mgr/dispatcher/inc/wlan_blm_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -103,6 +103,21 @@ wlan_blm_get_bssid_reject_list(struct wlan_objmgr_pdev *pdev, reject_ap_type); } +/** + * wlan_blm_get_rssi_blacklist_threshold() - Get the RSSI blacklist threshold + * @pdev: pdev object + * + * This API will get the rssi blacklist threshold value configured via + * CFG_BLACKLIST_RSSI_THRESHOLD. + * + * Return: int32_t (threshold value) + */ +static inline int32_t +wlan_blm_get_rssi_blacklist_threshold(struct wlan_objmgr_pdev *pdev) +{ + return blm_get_rssi_blacklist_threshold(pdev); +} + #else static inline QDF_STATUS wlan_blm_filter_bssid(struct wlan_objmgr_pdev *pdev, qdf_list_t *scan_list) @@ -133,5 +148,10 @@ wlan_blm_update_bssid_connect_params(struct wlan_objmgr_pdev *pdev, { } +static inline int32_t +wlan_blm_get_rssi_blacklist_threshold(struct wlan_objmgr_pdev *pdev) +{ + return 0; +} #endif #endif diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c index 807ad9be1d..44e903561f 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c @@ -41,7 +41,7 @@ #include "lim_ser_des_utils.h" #include "lim_send_messages.h" #include "lim_process_fils.h" -#include "wlan_blm_core.h" +#include "wlan_blm_api.h" /** * lim_update_stads_htcap() - Updates station Descriptor HT capability @@ -800,7 +800,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, if (!assoc_rsp->rssi_assoc_rej.retry_delay) ap_info.expected_rssi = assoc_rsp->rssi_assoc_rej.delta_rssi + WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info) + - blm_get_rssi_blacklist_threshold(mac_ctx->pdev); + wlan_blm_get_rssi_blacklist_threshold(mac_ctx->pdev); else ap_info.expected_rssi = assoc_rsp->rssi_assoc_rej.delta_rssi + WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info); diff --git a/core/mac/src/pe/lim/lim_process_disassoc_frame.c b/core/mac/src/pe/lim/lim_process_disassoc_frame.c index e31088395b..5c9869b9b0 100644 --- a/core/mac/src/pe/lim/lim_process_disassoc_frame.c +++ b/core/mac/src/pe/lim/lim_process_disassoc_frame.c @@ -41,7 +41,7 @@ #include "lim_ser_des_utils.h" #include "lim_send_messages.h" #include "sch_api.h" -#include "wlan_blm_core.h" +#include "wlan_blm_api.h" /** * lim_process_disassoc_frame @@ -306,7 +306,7 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo, ap_info.retry_delay = 0; ap_info.expected_rssi = frame_rssi + - blm_get_rssi_blacklist_threshold(mac->pdev); + wlan_blm_get_rssi_blacklist_threshold(mac->pdev); qdf_mem_copy(ap_info.bssid.bytes, pHdr->sa, QDF_MAC_ADDR_SIZE); lim_add_bssid_to_reject_list(mac->pdev, &ap_info); } diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index d4eb1e3fb0..7f1c329af8 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -80,7 +80,7 @@ #include #include #include -#include "wlan_blm_core.h" +#include "wlan_blm_api.h" #ifdef FEATURE_WLAN_DIAG_SUPPORT /* FEATURE_WLAN_DIAG_SUPPORT */ #include "host_diag_core_log.h" @@ -1427,7 +1427,7 @@ static QDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle, params->num_ssid_white_list = num_ssid_white_list; params->num_bssid_preferred_list = num_bssid_preferred_list; params->num_rssi_rejection_ap = num_rssi_rejection_ap; - params->delta_rssi = blm_get_rssi_blacklist_threshold(wma_handle->pdev); + params->delta_rssi = wlan_blm_get_rssi_blacklist_threshold(wma_handle->pdev); qdf_mem_copy(params->bssid_avoid_list, roam_params->bssid_avoid_list, MAX_BSSID_AVOID_LIST * sizeof(struct qdf_mac_addr));