diff --git a/Kbuild b/Kbuild index 746621cc30..3fd85c50b4 100644 --- a/Kbuild +++ b/Kbuild @@ -1551,12 +1551,12 @@ MLME_OBJS += $(WFA_TGT_IF_DIR)/src/target_if_wfa_testcmd.o \ $(call add-wlan-objs,mlme,$(MLME_OBJS)) -####### BLACKLIST_MGR ######## +####### DENYLIST_MGR ######## BLM_DIR := components/blacklist_mgr BLM_INC := -I$(WLAN_ROOT)/$(BLM_DIR)/core/inc \ -I$(WLAN_ROOT)/$(BLM_DIR)/dispatcher/inc -ifeq ($(CONFIG_FEATURE_BLACKLIST_MGR), y) +ifeq ($(CONFIG_FEATURE_DENYLIST_MGR), y) BLM_OBJS := $(BLM_DIR)/core/src/wlan_blm_main.o \ $(BLM_DIR)/core/src/wlan_blm_core.o \ $(BLM_DIR)/dispatcher/src/wlan_blm_ucfg_api.o \ @@ -1665,7 +1665,7 @@ CLD_TARGET_IF_INC += -I$(WLAN_ROOT)/$(CLD_TARGET_IF_DIR)/disa/inc CLD_TARGET_IF_OBJ += $(CLD_TARGET_IF_DIR)/disa/src/target_if_disa.o endif -ifeq ($(CONFIG_FEATURE_BLACKLIST_MGR), y) +ifeq ($(CONFIG_FEATURE_DENYLIST_MGR), y) CLD_TARGET_IF_INC += -I$(WLAN_ROOT)/$(CLD_TARGET_IF_DIR)/blacklist_mgr/inc CLD_TARGET_IF_OBJ += $(CLD_TARGET_IF_DIR)/blacklist_mgr/src/target_if_blm.o endif @@ -2933,7 +2933,7 @@ cppflags-$(CONFIG_REG_CLIENT) += -DCONFIG_REG_CLIENT cppflags-$(CONFIG_WLAN_PMO_ENABLE) += -DWLAN_PMO_ENABLE cppflags-$(CONFIG_CONVERGED_P2P_ENABLE) += -DCONVERGED_P2P_ENABLE cppflags-$(CONFIG_WLAN_POLICY_MGR_ENABLE) += -DWLAN_POLICY_MGR_ENABLE -cppflags-$(CONFIG_FEATURE_BLACKLIST_MGR) += -DFEATURE_BLACKLIST_MGR +cppflags-$(CONFIG_FEATURE_DENYLIST_MGR) += -DFEATURE_DENYLIST_MGR cppflags-$(CONFIG_WAPI_BIG_ENDIAN) += -DFEATURE_WAPI_BIG_ENDIAN cppflags-$(CONFIG_SUPPORT_11AX) += -DSUPPORT_11AX cppflags-$(CONFIG_HDD_INIT_WITH_RTNL_LOCK) += -DCONFIG_HDD_INIT_WITH_RTNL_LOCK diff --git a/components/blacklist_mgr/core/inc/wlan_blm_core.h b/components/blacklist_mgr/core/inc/wlan_blm_core.h index 9a85fc1b95..11963d8322 100644 --- a/components/blacklist_mgr/core/inc/wlan_blm_core.h +++ b/components/blacklist_mgr/core/inc/wlan_blm_core.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. 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 @@ -16,124 +17,124 @@ * PERFORMANCE OF THIS SOFTWARE. */ /** - * DOC: declare internal APIs related to the blacklist component + * DOC: declare internal APIs related to the denylist component */ -#ifndef _WLAN_BLM_CORE_H_ -#define _WLAN_BLM_CORE_H_ +#ifndef _WLAN_DLM_CORE_H_ +#define _WLAN_DLM_CORE_H_ #include -#define BLM_IS_AP_AVOIDED_BY_USERSPACE(cur_node) \ - cur_node->userspace_avoidlist +#define DLM_IS_AP_AVOIDED_BY_USERSPACE(cur_node) \ + (cur_node)->userspace_avoidlist -#define BLM_IS_AP_AVOIDED_BY_DRIVER(cur_node) \ - cur_node->driver_avoidlist +#define DLM_IS_AP_AVOIDED_BY_DRIVER(cur_node) \ + (cur_node)->driver_avoidlist -#define BLM_IS_AP_BLACKLISTED_BY_USERSPACE(cur_node) \ - cur_node->userspace_blacklist +#define DLM_IS_AP_DENYLISTED_BY_USERSPACE(cur_node) \ + (cur_node)->userspace_denylist -#define BLM_IS_AP_BLACKLISTED_BY_DRIVER(cur_node) \ - cur_node->driver_blacklist +#define DLM_IS_AP_DENYLISTED_BY_DRIVER(cur_node) \ + (cur_node)->driver_denylist -#define BLM_IS_AP_IN_MONITOR_LIST(cur_node) \ - cur_node->driver_monitorlist +#define DLM_IS_AP_IN_MONITOR_LIST(cur_node) \ + (cur_node)->driver_monitorlist -#define BLM_IS_AP_IN_RSSI_REJECT_LIST(cur_node) \ - cur_node->rssi_reject_list +#define DLM_IS_AP_IN_RSSI_REJECT_LIST(cur_node) \ + (cur_node)->rssi_reject_list -#define BLM_IS_AP_IN_BLACKLIST(cur_node) \ - (BLM_IS_AP_BLACKLISTED_BY_USERSPACE(cur_node) | \ - BLM_IS_AP_BLACKLISTED_BY_DRIVER(cur_node) | \ - BLM_IS_AP_IN_RSSI_REJECT_LIST(cur_node)) +#define DLM_IS_AP_IN_DENYLIST(cur_node) \ + (DLM_IS_AP_DENYLISTED_BY_USERSPACE(cur_node) | \ + DLM_IS_AP_DENYLISTED_BY_DRIVER(cur_node) | \ + DLM_IS_AP_IN_RSSI_REJECT_LIST(cur_node)) -#define BLM_IS_AP_IN_AVOIDLIST(cur_node) \ - (BLM_IS_AP_AVOIDED_BY_USERSPACE(cur_node) | \ - BLM_IS_AP_AVOIDED_BY_DRIVER(cur_node)) +#define DLM_IS_AP_IN_AVOIDLIST(cur_node) \ + (DLM_IS_AP_AVOIDED_BY_USERSPACE(cur_node) | \ + DLM_IS_AP_AVOIDED_BY_DRIVER(cur_node)) -#define IS_AP_IN_USERSPACE_BLACKLIST_ONLY(cur_node) \ - (BLM_IS_AP_BLACKLISTED_BY_USERSPACE(cur_node) & \ - !(BLM_IS_AP_IN_AVOIDLIST(cur_node) | \ - BLM_IS_AP_IN_MONITOR_LIST(cur_node) | \ - BLM_IS_AP_IN_RSSI_REJECT_LIST(cur_node) | \ - BLM_IS_AP_BLACKLISTED_BY_DRIVER(cur_node))) +#define IS_AP_IN_USERSPACE_DENYLIST_ONLY(cur_node) \ + (DLM_IS_AP_DENYLISTED_BY_USERSPACE(cur_node) & \ + !(DLM_IS_AP_IN_AVOIDLIST(cur_node) | \ + DLM_IS_AP_IN_MONITOR_LIST(cur_node) | \ + DLM_IS_AP_IN_RSSI_REJECT_LIST(cur_node) | \ + DLM_IS_AP_DENYLISTED_BY_DRIVER(cur_node))) #define IS_AP_IN_MONITOR_LIST_ONLY(cur_node) \ - (BLM_IS_AP_IN_MONITOR_LIST(cur_node) & \ - !(BLM_IS_AP_IN_AVOIDLIST(cur_node) | \ - BLM_IS_AP_IN_BLACKLIST(cur_node))) + (DLM_IS_AP_IN_MONITOR_LIST(cur_node) & \ + !(DLM_IS_AP_IN_AVOIDLIST(cur_node) | \ + DLM_IS_AP_IN_DENYLIST(cur_node))) #define IS_AP_IN_AVOID_LIST_ONLY(cur_node) \ - (BLM_IS_AP_IN_AVOIDLIST(cur_node) & \ - !(BLM_IS_AP_IN_MONITOR_LIST(cur_node) | \ - BLM_IS_AP_IN_BLACKLIST(cur_node))) + (DLM_IS_AP_IN_AVOIDLIST(cur_node) & \ + !(DLM_IS_AP_IN_MONITOR_LIST(cur_node) | \ + DLM_IS_AP_IN_DENYLIST(cur_node))) -#define IS_AP_IN_DRIVER_BLACKLIST_ONLY(cur_node) \ - (BLM_IS_AP_BLACKLISTED_BY_DRIVER(cur_node) & \ - !(BLM_IS_AP_IN_AVOIDLIST(cur_node) | \ - BLM_IS_AP_IN_MONITOR_LIST(cur_node) | \ - BLM_IS_AP_IN_RSSI_REJECT_LIST(cur_node) | \ - BLM_IS_AP_BLACKLISTED_BY_USERSPACE(cur_node))) +#define IS_AP_IN_DRIVER_DENYLIST_ONLY(cur_node) \ + (DLM_IS_AP_DENYLISTED_BY_DRIVER(cur_node) & \ + !(DLM_IS_AP_IN_AVOIDLIST(cur_node) | \ + DLM_IS_AP_IN_MONITOR_LIST(cur_node) | \ + DLM_IS_AP_IN_RSSI_REJECT_LIST(cur_node) | \ + DLM_IS_AP_DENYLISTED_BY_USERSPACE(cur_node))) #define IS_AP_IN_RSSI_REJECT_LIST_ONLY(cur_node) \ - (BLM_IS_AP_IN_RSSI_REJECT_LIST(cur_node) & \ - !(BLM_IS_AP_IN_AVOIDLIST(cur_node) | \ - BLM_IS_AP_IN_MONITOR_LIST(cur_node) | \ - BLM_IS_AP_BLACKLISTED_BY_DRIVER(cur_node) | \ - BLM_IS_AP_BLACKLISTED_BY_USERSPACE(cur_node))) + (DLM_IS_AP_IN_RSSI_REJECT_LIST(cur_node) & \ + !(DLM_IS_AP_IN_AVOIDLIST(cur_node) | \ + DLM_IS_AP_IN_MONITOR_LIST(cur_node) | \ + DLM_IS_AP_DENYLISTED_BY_DRIVER(cur_node) | \ + DLM_IS_AP_DENYLISTED_BY_USERSPACE(cur_node))) #define IS_AP_IN_USERSPACE_AVOID_LIST_ONLY(cur_node) \ - (BLM_IS_AP_AVOIDED_BY_USERSPACE(cur_node) & \ - !(BLM_IS_AP_AVOIDED_BY_DRIVER(cur_node) | \ - BLM_IS_AP_IN_MONITOR_LIST(cur_node) | \ - BLM_IS_AP_IN_BLACKLIST(cur_node))) + (DLM_IS_AP_AVOIDED_BY_USERSPACE(cur_node) & \ + !(DLM_IS_AP_AVOIDED_BY_DRIVER(cur_node) | \ + DLM_IS_AP_IN_MONITOR_LIST(cur_node) | \ + DLM_IS_AP_IN_DENYLIST(cur_node))) #define IS_AP_IN_DRIVER_AVOID_LIST_ONLY(cur_node) \ - (BLM_IS_AP_AVOIDED_BY_DRIVER(cur_node) & \ - !(BLM_IS_AP_AVOIDED_BY_USERSPACE(cur_node) | \ - BLM_IS_AP_IN_MONITOR_LIST(cur_node) | \ - BLM_IS_AP_IN_BLACKLIST(cur_node))) + (DLM_IS_AP_AVOIDED_BY_DRIVER(cur_node) & \ + !(DLM_IS_AP_AVOIDED_BY_USERSPACE(cur_node) | \ + DLM_IS_AP_IN_MONITOR_LIST(cur_node) | \ + DLM_IS_AP_IN_DENYLIST(cur_node))) /** - * struct blm_reject_ap_timestamp - Structure to store the reject list BSSIDs + * struct dlm_reject_ap_timestamp - Structure to store the reject list BSSIDs * entry time stamp. * @userspace_avoid_timestamp: Time when userspace adds BSSID to avoid list. * @driver_avoid_timestamp: Time when driver adds BSSID to avoid list. - * @userspace_blacklist_timestamp: Time when userspace adds BSSID to black list. - * @driver_blacklist_timestamp: Time when driver adds BSSID to black list. + * @userspace_denylist_timestamp: Time when userspace adds BSSID to deny list. + * @driver_denylist_timestamp: Time when driver adds BSSID to deny list. * @rssi_reject_timestamp: Time when driver adds BSSID to rssi reject list. * @driver_monitor_timestamp: Time when driver adds BSSID to monitor list. */ -struct blm_reject_ap_timestamp { +struct dlm_reject_ap_timestamp { qdf_time_t userspace_avoid_timestamp; qdf_time_t driver_avoid_timestamp; - qdf_time_t userspace_blacklist_timestamp; - qdf_time_t driver_blacklist_timestamp; + qdf_time_t userspace_denylist_timestamp; + qdf_time_t driver_denylist_timestamp; qdf_time_t rssi_reject_timestamp; qdf_time_t driver_monitor_timestamp; }; /** - * struct blm_reject_ap - Structure of a node added to blacklist manager + * struct dlm_reject_ap - Structure of a node added to denylist manager * @node: Node of the entry * @bssid: Bssid of the AP entry. * @rssi_reject_params: Rssi reject params of the AP entry. * @bad_bssid_counter: It represent how many times data stall happened. * @ap_timestamp: Ap timestamp. - * @reject_ap_type: what is the type of rejection for the AP (avoid, black etc.) - * @reject_ap_reason: reason for adding the BSSID to BLM + * @reject_ap_type: what is the type of rejection for the AP (avoid, deny etc.) + * @reject_ap_reason: reason for adding the BSSID to DLM * @connect_timestamp: Timestamp when the STA got connected with this BSSID */ -struct blm_reject_ap { +struct dlm_reject_ap { qdf_list_node_t node; struct qdf_mac_addr bssid; - struct blm_rssi_disallow_params rssi_reject_params; + struct dlm_rssi_disallow_params rssi_reject_params; uint8_t bad_bssid_counter; - struct blm_reject_ap_timestamp ap_timestamp; + struct dlm_reject_ap_timestamp ap_timestamp; union { struct { - uint8_t userspace_blacklist:1, - driver_blacklist:1, + uint8_t userspace_denylist:1, + driver_denylist:1, userspace_avoidlist:1, driver_avoidlist:1, rssi_reject_list:1, @@ -148,7 +149,7 @@ struct blm_reject_ap { ho_fail:1, poor_rssi:1, oce_assoc_reject:1, - blacklist_userspace:1, + denylist_userspace:1, avoid_userspace:1, btm_disassoc_imminent:1, btm_bss_termination:1, @@ -158,145 +159,145 @@ struct blm_reject_ap { }; uint32_t reject_ap_reason; }; - enum blm_reject_ap_source source; + enum dlm_reject_ap_source source; qdf_time_t connect_timestamp; }; /** - * blm_add_bssid_to_reject_list() - Add BSSID to the specific reject list. + * dlm_add_bssid_to_reject_list() - Add BSSID to the specific reject list. * @pdev: Pdev object * @ap_info: Ap info params such as BSSID, and the type of rejection to be done * - * This API will add the BSSID to the reject AP list maintained by the blacklist + * This API will add the BSSID to the reject AP list maintained by the denylist * manager. * * Return: QDF status */ QDF_STATUS -blm_add_bssid_to_reject_list(struct wlan_objmgr_pdev *pdev, +dlm_add_bssid_to_reject_list(struct wlan_objmgr_pdev *pdev, struct reject_ap_info *ap_info); #if defined(WLAN_FEATURE_ROAM_OFFLOAD) /** - * blm_send_reject_ap_list_to_fw() - Send the blacklist BSSIDs to FW + * dlm_send_reject_ap_list_to_fw() - Send the denylist BSSIDs to FW * @pdev: Pdev object - * @reject_db_list: List of blacklist BSSIDs - * @cfg: Blacklist manager cfg + * @reject_db_list: List of denylist BSSIDs + * @cfg: Denylist manager cfg * - * This API will send the blacklist BSSIDs to FW for avoiding or blacklisting + * This API will send the denylist BSSIDs to FW for avoiding or denylisting * in roaming scenarios. * * Return: None */ void -blm_send_reject_ap_list_to_fw(struct wlan_objmgr_pdev *pdev, +dlm_send_reject_ap_list_to_fw(struct wlan_objmgr_pdev *pdev, qdf_list_t *reject_db_list, - struct blm_config *cfg); + struct dlm_config *cfg); /** - * blm_update_reject_ap_list_to_fw() - Send the blacklist BSSIDs to FW + * dlm_update_reject_ap_list_to_fw() - Send the denylist BSSIDs to FW * @psoc: psoc object * - * This API will send the blacklist BSSIDs to FW. + * This API will send the denylist BSSIDs to FW. * * Return: None */ -void blm_update_reject_ap_list_to_fw(struct wlan_objmgr_psoc *psoc); +void dlm_update_reject_ap_list_to_fw(struct wlan_objmgr_psoc *psoc); #else -static inline void blm_send_reject_ap_list_to_fw(struct wlan_objmgr_pdev *pdev, +static inline void dlm_send_reject_ap_list_to_fw(struct wlan_objmgr_pdev *pdev, qdf_list_t *reject_db_list, - struct blm_config *cfg) + struct dlm_config *cfg) { } static inline void -blm_update_reject_ap_list_to_fw(struct wlan_objmgr_psoc *psoc) +dlm_update_reject_ap_list_to_fw(struct wlan_objmgr_psoc *psoc) { } #endif /** - * blm_add_userspace_black_list() - Clear already existing userspace BSSID, and - * add the new ones to blacklist manager. + * dlm_add_userspace_deny_list() - Clear already existing userspace BSSID, and + * add the new ones to denylist manager. * @pdev: pdev object - * @bssid_black_list: BSSIDs to be blacklisted by userspace. - * @num_of_bssid: num of bssids to be blacklisted. + * @bssid_deny_list: BSSIDs to be denylisted by userspace. + * @num_of_bssid: num of bssids to be denylisted. * * This API will Clear already existing userspace BSSID, and add the new ones - * to blacklist manager's reject list. + * to denylist manager's reject list. * * Return: QDF status */ QDF_STATUS -blm_add_userspace_black_list(struct wlan_objmgr_pdev *pdev, - struct qdf_mac_addr *bssid_black_list, - uint8_t num_of_bssid); +dlm_add_userspace_deny_list(struct wlan_objmgr_pdev *pdev, + struct qdf_mac_addr *bssid_deny_list, + uint8_t num_of_bssid); /** - * blm_update_bssid_connect_params() - Inform the BLM about connect/disconnect + * dlm_update_bssid_connect_params() - Inform the DLM about connect/disconnect * with the current AP. * @pdev: pdev object * @bssid: BSSID of the AP * @con_state: Connection stae (connected/disconnected) * - * This API will inform the BLM about the state with the AP so that if the AP + * This API will inform the DLM about the state with the AP so that if the AP * is selected, and the connection went through, and the connection did not - * face any data stall till the bad bssid reset timer, BLM can remove the + * face any data stall till the bad bssid reset timer, DLM can remove the * AP from the reject ap list maintained by it. * * Return: None */ void -blm_update_bssid_connect_params(struct wlan_objmgr_pdev *pdev, +dlm_update_bssid_connect_params(struct wlan_objmgr_pdev *pdev, struct qdf_mac_addr bssid, - enum blm_connection_state con_state); + enum dlm_connection_state con_state); /** - * blm_flush_reject_ap_list() - Clear away BSSID and destroy the reject ap list - * @blm_ctx: blacklist manager pdev priv object + * dlm_flush_reject_ap_list() - Clear away BSSID and destroy the reject ap list + * @dlm_ctx: denylist manager pdev priv object * * This API will clear the BSSID info in the reject AP list maintained by the - * blacklist manager, and will destroy the list as well. + * denylist manager, and will destroy the list as well. * * Return: None */ void -blm_flush_reject_ap_list(struct blm_pdev_priv_obj *blm_ctx); +dlm_flush_reject_ap_list(struct dlm_pdev_priv_obj *dlm_ctx); /** - * blm_get_bssid_reject_list() - Get the BSSIDs in reject list from BLM + * dlm_get_bssid_reject_list() - Get the BSSIDs in reject list from DLM * @pdev: pdev object * @reject_list: reject list to be filled (passed by caller) - * @max_bssid_to_be_filled: num of bssids filled in reject list by BLM + * @max_bssid_to_be_filled: num of bssids filled in reject list by DLM * @reject_ap_type: reject ap type of the BSSIDs to be filled. * * This API will fill the reject ap list requested by caller of type given as * argument reject_ap_type, and will return the number of BSSIDs filled. * - * Return: Unsigned integer (number of BSSIDs filled by the blacklist manager) + * Return: Unsigned integer (number of BSSIDs filled by the denylist manager) */ uint8_t -blm_get_bssid_reject_list(struct wlan_objmgr_pdev *pdev, +dlm_get_bssid_reject_list(struct wlan_objmgr_pdev *pdev, struct reject_ap_config_params *reject_list, uint8_t max_bssid_to_be_filled, - enum blm_reject_ap_type reject_ap_type); + enum dlm_reject_ap_type reject_ap_type); /** - * blm_dump_blacklist_bssid - Dump blacklisted bssids + * dlm_dump_denylist_bssid - Dump denylisted bssids * @pdev: pdev object * * Return: None */ -void blm_dump_blacklist_bssid(struct wlan_objmgr_pdev *pdev); +void dlm_dump_denylist_bssid(struct wlan_objmgr_pdev *pdev); /** - * blm_get_rssi_blacklist_threshold() - Get rssi blacklist threshold value + * dlm_get_rssi_denylist_threshold() - Get rssi denylist threshold value * @pdev: pdev object * - * This API will get the RSSI blacklist threshold info. + * This API will get the RSSI denylist threshold info. * * Return: rssi theshold value */ int32_t -blm_get_rssi_blacklist_threshold(struct wlan_objmgr_pdev *pdev); +dlm_get_rssi_denylist_threshold(struct wlan_objmgr_pdev *pdev); #endif diff --git a/components/blacklist_mgr/core/inc/wlan_blm_main.h b/components/blacklist_mgr/core/inc/wlan_blm_main.h index dbe318131f..bab7ad8938 100644 --- a/components/blacklist_mgr/core/inc/wlan_blm_main.h +++ b/components/blacklist_mgr/core/inc/wlan_blm_main.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. 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 @@ -16,79 +17,79 @@ * PERFORMANCE OF THIS SOFTWARE. */ /** - * DOC: declare internal APIs related to the blacklist manager component + * DOC: declare internal APIs related to the denylist manager component */ -#ifndef _WLAN_BLM_MAIN_H_ -#define _WLAN_BLM_MAIN_H_ +#ifndef _WLAN_DLM_MAIN_H_ +#define _WLAN_DLM_MAIN_H_ #include #include #include #include -#define blm_fatal(params...)\ - QDF_TRACE_FATAL(QDF_MODULE_ID_BLACKLIST_MGR, params) -#define blm_err(params...)\ - QDF_TRACE_ERROR(QDF_MODULE_ID_BLACKLIST_MGR, params) -#define blm_warn(params...)\ - QDF_TRACE_WARN(QDF_MODULE_ID_BLACKLIST_MGR, params) -#define blm_info(params...)\ - QDF_TRACE_INFO(QDF_MODULE_ID_BLACKLIST_MGR, params) -#define blm_debug(params...)\ - QDF_TRACE_DEBUG(QDF_MODULE_ID_BLACKLIST_MGR, params) -#define blm_nofl_debug(params...)\ - QDF_TRACE_DEBUG_NO_FL(QDF_MODULE_ID_BLACKLIST_MGR, params) +#define dlm_fatal(params...)\ + QDF_TRACE_FATAL(QDF_MODULE_ID_DENYLIST_MGR, params) +#define dlm_err(params...)\ + QDF_TRACE_ERROR(QDF_MODULE_ID_DENYLIST_MGR, params) +#define dlm_warn(params...)\ + QDF_TRACE_WARN(QDF_MODULE_ID_DENYLIST_MGR, params) +#define dlm_info(params...)\ + QDF_TRACE_INFO(QDF_MODULE_ID_DENYLIST_MGR, params) +#define dlm_debug(params...)\ + QDF_TRACE_DEBUG(QDF_MODULE_ID_DENYLIST_MGR, params) +#define dlm_nofl_debug(params...)\ + QDF_TRACE_DEBUG_NO_FL(QDF_MODULE_ID_DENYLIST_MGR, params) /** - * struct blm_pdev_priv_obj - Pdev priv struct to store list of blacklist mgr. + * struct dlm_pdev_priv_obj - Pdev priv struct to store list of denylist mgr. * @reject_ap_list_lock: Mutex needed to restrict two threads updating the list. * @reject_ap_list: The reject Ap list which would contain the list of bad APs. - * @blm_tx_ops: tx ops to send reject ap list to FW + * @dlm_tx_ops: tx ops to send reject ap list to FW */ -struct blm_pdev_priv_obj { +struct dlm_pdev_priv_obj { qdf_mutex_t reject_ap_list_lock; qdf_list_t reject_ap_list; - struct wlan_blm_tx_ops blm_tx_ops; + struct wlan_dlm_tx_ops dlm_tx_ops; }; /** - * struct blm_config - Structure to define the config params for blacklist mgr. + * struct dlm_config - Structure to define the config params for denylist mgr. * @avoid_list_exipry_time: Timer after which transition from avoid->monitor * would happen for the BSSID which is in avoid list. - * @black_list_exipry_time: Timer after which transition from black->monitor - * would happen for the BSSID which is in black list. + * @deny_list_exipry_time: Timer after which transition from deny->monitor + * would happen for the BSSID which is in deny list. * @bad_bssid_counter_reset_time: Timer after which the bssid would be removed * from the reject list when connected, and data stall is not seen with the AP. * @bad_bssid_counter_thresh: This is the threshold count which is incremented * after every NUD fail, and after this much count, the BSSID would be moved to - * blacklist. + * denylist. * @delta_rssi: This is the rssi threshold, only when rssi - * improves by this value the entry for BSSID should be removed from black + * improves by this value the entry for BSSID should be removed from deny * list manager list. */ -struct blm_config { +struct dlm_config { qdf_time_t avoid_list_exipry_time; - qdf_time_t black_list_exipry_time; + qdf_time_t deny_list_exipry_time; qdf_time_t bad_bssid_counter_reset_time; uint8_t bad_bssid_counter_thresh; uint32_t delta_rssi; }; /** - * struct blm_psoc_priv_obj - Psoc priv structure of the blacklist manager. + * struct dlm_psoc_priv_obj - Psoc priv structure of the denylist manager. * @pdev_id: pdev id - * @is_suspended: is black list manager state suspended - * @blm_cfg: These are the config ini params that the user can configure. + * @is_suspended: is deny list manager state suspended + * @dlm_cfg: These are the config ini params that the user can configure. */ -struct blm_psoc_priv_obj { +struct dlm_psoc_priv_obj { uint8_t pdev_id; bool is_suspended; - struct blm_config blm_cfg; + struct dlm_config dlm_cfg; }; /** - * blm_pdev_object_created_notification() - blacklist mgr pdev create + * dlm_pdev_object_created_notification() - denylist mgr pdev create * handler * @pdev: pdev which is going to be created by objmgr * @arg: argument for pdev create handler @@ -98,11 +99,11 @@ struct blm_psoc_priv_obj { * Return: QDF_STATUS status in case of success else return error */ QDF_STATUS -blm_pdev_object_created_notification(struct wlan_objmgr_pdev *pdev, +dlm_pdev_object_created_notification(struct wlan_objmgr_pdev *pdev, void *arg); /** - * blm_pdev_object_destroyed_notification() - blacklist mgr pdev delete handler + * dlm_pdev_object_destroyed_notification() - denylist mgr pdev delete handler * @pdev: pdev which is going to be deleted by objmgr * @arg: argument for pdev delete handler * @@ -111,11 +112,11 @@ blm_pdev_object_created_notification(struct wlan_objmgr_pdev *pdev, * Return: QDF_STATUS status in case of success else return error */ QDF_STATUS -blm_pdev_object_destroyed_notification(struct wlan_objmgr_pdev *pdev, +dlm_pdev_object_destroyed_notification(struct wlan_objmgr_pdev *pdev, void *arg); /** - * blm_psoc_object_created_notification() - blacklist mgr psoc create handler + * dlm_psoc_object_created_notification() - denylist mgr psoc create handler * @psoc: psoc which is going to be created by objmgr * @arg: argument for psoc create handler * @@ -124,11 +125,11 @@ blm_pdev_object_destroyed_notification(struct wlan_objmgr_pdev *pdev, * Return: QDF_STATUS status in case of success else return error */ QDF_STATUS -blm_psoc_object_created_notification(struct wlan_objmgr_psoc *psoc, +dlm_psoc_object_created_notification(struct wlan_objmgr_psoc *psoc, void *arg); /** - * blm_psoc_object_destroyed_notification() - blacklist mgr psoc delete handler + * dlm_psoc_object_destroyed_notification() - denylist mgr psoc delete handler * @psoc: psoc which is going to be deleted by objmgr * @arg: argument for psoc delete handler. * @@ -137,41 +138,41 @@ blm_psoc_object_created_notification(struct wlan_objmgr_psoc *psoc, * Return: QDF_STATUS status in case of success else return error */ QDF_STATUS -blm_psoc_object_destroyed_notification(struct wlan_objmgr_psoc *psoc, +dlm_psoc_object_destroyed_notification(struct wlan_objmgr_psoc *psoc, void *arg); /** - * blm_cfg_psoc_open() - blacklist mgr psoc open handler + * dlm_cfg_psoc_open() - denylist mgr psoc open handler * @psoc: psoc which is initialized by objmgr * * This API will initialize the config file, and store the config while in the - * psoc priv object of the blacklist manager. + * psoc priv object of the denylist manager. * * Return: QDF_STATUS status in case of success else return error */ QDF_STATUS -blm_cfg_psoc_open(struct wlan_objmgr_psoc *psoc); +dlm_cfg_psoc_open(struct wlan_objmgr_psoc *psoc); /** - * blm_get_pdev_obj() - Get the pdev priv object of the blacklist manager + * dlm_get_pdev_obj() - Get the pdev priv object of the denylist manager * @pdev: pdev object * - * Get the pdev priv object of the blacklist manager + * Get the pdev priv object of the denylist manager * * Return: Pdev priv object if present, else NULL. */ -struct blm_pdev_priv_obj * -blm_get_pdev_obj(struct wlan_objmgr_pdev *pdev); +struct dlm_pdev_priv_obj * +dlm_get_pdev_obj(struct wlan_objmgr_pdev *pdev); /** - * blm_get_psoc_obj() - Get the psoc priv object of the blacklist manager + * dlm_get_psoc_obj() - Get the psoc priv object of the denylist manager * @psoc: psoc object * - * Get the psoc priv object of the blacklist manager + * Get the psoc priv object of the denylist manager * * Return: Psoc priv object if present, else NULL. */ -struct blm_psoc_priv_obj * -blm_get_psoc_obj(struct wlan_objmgr_psoc *psoc); +struct dlm_psoc_priv_obj * +dlm_get_psoc_obj(struct wlan_objmgr_psoc *psoc); #endif diff --git a/components/blacklist_mgr/core/src/wlan_blm_core.c b/components/blacklist_mgr/core/src/wlan_blm_core.c index 46b717e928..a9222fca93 100644 --- a/components/blacklist_mgr/core/src/wlan_blm_core.c +++ b/components/blacklist_mgr/core/src/wlan_blm_core.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. 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 @@ -16,7 +17,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ /** - * DOC: declare internal APIs related to the blacklist component + * DOC: declare internal APIs related to the denylist component */ #include @@ -27,12 +28,12 @@ #include "wlan_blm_tgt_api.h" #include -#define SECONDS_TO_MS(params) (params * 1000) +#define SECONDS_TO_MS(params) ((params) * 1000) #define MINUTES_TO_MS(params) (SECONDS_TO_MS(params) * 60) #define RSSI_TIMEOUT_VALUE 60 static void -blm_update_ap_info(struct blm_reject_ap *blm_entry, struct blm_config *cfg, +dlm_update_ap_info(struct dlm_reject_ap *dlm_entry, struct dlm_config *cfg, struct scan_cache_entry *scan_entry) { qdf_time_t cur_timestamp = qdf_mc_timer_get_system_time(); @@ -40,72 +41,72 @@ blm_update_ap_info(struct blm_reject_ap *blm_entry, struct blm_config *cfg, bool update_done = false; uint8_t old_reject_ap_type; - old_reject_ap_type = blm_entry->reject_ap_type; + old_reject_ap_type = dlm_entry->reject_ap_type; - if (BLM_IS_AP_AVOIDED_BY_USERSPACE(blm_entry)) { + if (DLM_IS_AP_AVOIDED_BY_USERSPACE(dlm_entry)) { entry_add_time = - blm_entry->ap_timestamp.userspace_avoid_timestamp; + dlm_entry->ap_timestamp.userspace_avoid_timestamp; if ((cur_timestamp - entry_add_time) >= MINUTES_TO_MS(cfg->avoid_list_exipry_time)) { /* Move AP to monitor list as avoid list time is over */ - blm_entry->userspace_avoidlist = false; - blm_entry->avoid_userspace = false; - blm_entry->driver_monitorlist = true; + dlm_entry->userspace_avoidlist = false; + dlm_entry->avoid_userspace = false; + dlm_entry->driver_monitorlist = true; - blm_entry->ap_timestamp.driver_monitor_timestamp = + dlm_entry->ap_timestamp.driver_monitor_timestamp = cur_timestamp; - blm_debug("Userspace avoid list timer expired, moved to monitor list"); + dlm_debug("Userspace avoid list timer expired, moved to monitor list"); update_done = true; } } - if (BLM_IS_AP_AVOIDED_BY_DRIVER(blm_entry)) { - entry_add_time = blm_entry->ap_timestamp.driver_avoid_timestamp; + if (DLM_IS_AP_AVOIDED_BY_DRIVER(dlm_entry)) { + entry_add_time = dlm_entry->ap_timestamp.driver_avoid_timestamp; if ((cur_timestamp - entry_add_time) >= MINUTES_TO_MS(cfg->avoid_list_exipry_time)) { /* Move AP to monitor list as avoid list time is over */ - blm_entry->driver_avoidlist = false; - blm_entry->nud_fail = false; - blm_entry->sta_kickout = false; - blm_entry->ho_fail = false; - blm_entry->driver_monitorlist = true; + dlm_entry->driver_avoidlist = false; + dlm_entry->nud_fail = false; + dlm_entry->sta_kickout = false; + dlm_entry->ho_fail = false; + dlm_entry->driver_monitorlist = true; - blm_entry->ap_timestamp.driver_monitor_timestamp = + dlm_entry->ap_timestamp.driver_monitor_timestamp = cur_timestamp; - blm_debug("Driver avoid list timer expired, moved to monitor list"); + dlm_debug("Driver avoid list timer expired, moved to monitor list"); update_done = true; } } - if (BLM_IS_AP_BLACKLISTED_BY_DRIVER(blm_entry)) { + if (DLM_IS_AP_DENYLISTED_BY_DRIVER(dlm_entry)) { entry_add_time = - blm_entry->ap_timestamp.driver_blacklist_timestamp; + dlm_entry->ap_timestamp.driver_denylist_timestamp; if ((cur_timestamp - entry_add_time) >= - MINUTES_TO_MS(cfg->black_list_exipry_time)) { - /* Move AP to monitor list as black list time is over */ - blm_entry->driver_blacklist = false; - blm_entry->driver_monitorlist = true; - blm_entry->nud_fail = false; - blm_entry->sta_kickout = false; - blm_entry->ho_fail = false; - blm_entry->ap_timestamp.driver_monitor_timestamp = + MINUTES_TO_MS(cfg->deny_list_exipry_time)) { + /* Move AP to monitor list as deny list time is over */ + dlm_entry->driver_denylist = false; + dlm_entry->driver_monitorlist = true; + dlm_entry->nud_fail = false; + dlm_entry->sta_kickout = false; + dlm_entry->ho_fail = false; + dlm_entry->ap_timestamp.driver_monitor_timestamp = cur_timestamp; - blm_debug("Driver blacklist timer expired, moved to monitor list"); + dlm_debug("Driver denylist timer expired, moved to monitor list"); update_done = true; } } - if (BLM_IS_AP_IN_RSSI_REJECT_LIST(blm_entry)) { + if (DLM_IS_AP_IN_RSSI_REJECT_LIST(dlm_entry)) { qdf_time_t entry_age = cur_timestamp - - blm_entry->ap_timestamp.rssi_reject_timestamp; + dlm_entry->ap_timestamp.rssi_reject_timestamp; - if ((blm_entry->rssi_reject_params.retry_delay && - entry_age >= blm_entry->rssi_reject_params.retry_delay) || - (scan_entry && (scan_entry->rssi_raw >= blm_entry-> - rssi_reject_params.expected_rssi))) { + if ((dlm_entry->rssi_reject_params.retry_delay && + entry_age >= dlm_entry->rssi_reject_params.retry_delay) || + (scan_entry && scan_entry->rssi_raw >= + dlm_entry->rssi_reject_params.expected_rssi)) { /* * Remove from the rssi reject list as:- * 1. In case of OCE reject, both the time, and RSSI @@ -121,18 +122,18 @@ blm_update_ap_info(struct blm_reject_ap *blm_entry, struct blm_config *cfg, * for BTM message will fail (expected), as BTM does * not care about the same. */ - blm_entry->poor_rssi = false; - blm_entry->oce_assoc_reject = false; - blm_entry->btm_bss_termination = false; - blm_entry->btm_disassoc_imminent = false; - blm_entry->btm_mbo_retry = false; - blm_entry->no_more_stas = false; - blm_entry->reassoc_rssi_reject = false; - blm_entry->rssi_reject_list = false; - blm_debug("Remove BSSID from rssi reject expected RSSI = %d, current RSSI = %d, retry delay required = %d ms, delay = %lu ms", - blm_entry->rssi_reject_params.expected_rssi, + dlm_entry->poor_rssi = false; + dlm_entry->oce_assoc_reject = false; + dlm_entry->btm_bss_termination = false; + dlm_entry->btm_disassoc_imminent = false; + dlm_entry->btm_mbo_retry = false; + dlm_entry->no_more_stas = false; + dlm_entry->reassoc_rssi_reject = false; + dlm_entry->rssi_reject_list = false; + dlm_debug("Remove BSSID from rssi reject expected RSSI = %d, current RSSI = %d, retry delay required = %d ms, delay = %lu ms", + dlm_entry->rssi_reject_params.expected_rssi, scan_entry ? scan_entry->rssi_raw : 0, - blm_entry->rssi_reject_params.retry_delay, + dlm_entry->rssi_reject_params.retry_delay, entry_age); update_done = true; } @@ -141,142 +142,142 @@ blm_update_ap_info(struct blm_reject_ap *blm_entry, struct blm_config *cfg, if (!update_done) return; - blm_debug(QDF_MAC_ADDR_FMT" Old %d Updated reject ap type = %x", - QDF_MAC_ADDR_REF(blm_entry->bssid.bytes), + dlm_debug(QDF_MAC_ADDR_FMT " Old %d Updated reject ap type = %x", + QDF_MAC_ADDR_REF(dlm_entry->bssid.bytes), old_reject_ap_type, - blm_entry->reject_ap_type); + dlm_entry->reject_ap_type); } #define MAX_BL_TIME 255000 -static enum cm_blacklist_action -blm_prune_old_entries_and_get_action(struct blm_reject_ap *blm_entry, - struct blm_config *cfg, +static enum cm_denylist_action +dlm_prune_old_entries_and_get_action(struct dlm_reject_ap *dlm_entry, + struct dlm_config *cfg, struct scan_cache_entry *entry, qdf_list_t *reject_ap_list) { - blm_update_ap_info(blm_entry, cfg, entry); + dlm_update_ap_info(dlm_entry, cfg, entry); /* * If all entities have cleared the bits of reject ap type, then * the AP is not needed in the database,(reject_ap_type should be 0), * then remove the entry from the reject ap list. */ - if (!blm_entry->reject_ap_type) { - blm_debug(QDF_MAC_ADDR_FMT" cleared from list", - QDF_MAC_ADDR_REF(blm_entry->bssid.bytes)); - qdf_list_remove_node(reject_ap_list, &blm_entry->node); - qdf_mem_free(blm_entry); - return CM_BLM_NO_ACTION; + if (!dlm_entry->reject_ap_type) { + dlm_debug(QDF_MAC_ADDR_FMT " cleared from list", + QDF_MAC_ADDR_REF(dlm_entry->bssid.bytes)); + qdf_list_remove_node(reject_ap_list, &dlm_entry->node); + qdf_mem_free(dlm_entry); + return CM_DLM_NO_ACTION; } - if (BLM_IS_AP_IN_RSSI_REJECT_LIST(blm_entry) && - !blm_entry->userspace_blacklist && !blm_entry->driver_blacklist && - blm_entry->rssi_reject_params.original_timeout > MAX_BL_TIME) { - blm_info("Allow BSSID "QDF_MAC_ADDR_FMT" as the retry delay is greater than %u ms, expected RSSI = %d, current RSSI = %d, retry delay = %u ms original timeout %u time added %lu source %d reason %d", - QDF_MAC_ADDR_REF(blm_entry->bssid.bytes), MAX_BL_TIME, - blm_entry->rssi_reject_params.expected_rssi, + if (DLM_IS_AP_IN_RSSI_REJECT_LIST(dlm_entry) && + !dlm_entry->userspace_denylist && !dlm_entry->driver_denylist && + dlm_entry->rssi_reject_params.original_timeout > MAX_BL_TIME) { + dlm_info("Allow BSSID " QDF_MAC_ADDR_FMT " as the retry delay is greater than %u ms, expected RSSI = %d, current RSSI = %d, retry delay = %u ms original timeout %u time added %lu source %d reason %d", + QDF_MAC_ADDR_REF(dlm_entry->bssid.bytes), MAX_BL_TIME, + dlm_entry->rssi_reject_params.expected_rssi, entry ? entry->rssi_raw : 0, - blm_entry->rssi_reject_params.retry_delay, - blm_entry->rssi_reject_params.original_timeout, - blm_entry->rssi_reject_params.received_time, - blm_entry->source, blm_entry->reject_ap_reason); + dlm_entry->rssi_reject_params.retry_delay, + dlm_entry->rssi_reject_params.original_timeout, + dlm_entry->rssi_reject_params.received_time, + dlm_entry->source, dlm_entry->reject_ap_reason); - if (BLM_IS_AP_IN_AVOIDLIST(blm_entry)) { - blm_debug(QDF_MAC_ADDR_FMT" in avoid list, deprioritize it", - QDF_MAC_ADDR_REF(blm_entry->bssid.bytes)); - return CM_BLM_AVOID; + if (DLM_IS_AP_IN_AVOIDLIST(dlm_entry)) { + dlm_debug(QDF_MAC_ADDR_FMT " in avoid list, deprioritize it", + QDF_MAC_ADDR_REF(dlm_entry->bssid.bytes)); + return CM_DLM_AVOID; } - return CM_BLM_NO_ACTION; + return CM_DLM_NO_ACTION; } - if (BLM_IS_AP_IN_BLACKLIST(blm_entry)) { - blm_debug(QDF_MAC_ADDR_FMT" in blacklist list, reject ap type %d removing from candidate list", - QDF_MAC_ADDR_REF(blm_entry->bssid.bytes), - blm_entry->reject_ap_type); + if (DLM_IS_AP_IN_DENYLIST(dlm_entry)) { + dlm_debug(QDF_MAC_ADDR_FMT " in denylist list, reject ap type %d removing from candidate list", + QDF_MAC_ADDR_REF(dlm_entry->bssid.bytes), + dlm_entry->reject_ap_type); - if (BLM_IS_AP_BLACKLISTED_BY_USERSPACE(blm_entry) || - BLM_IS_AP_IN_RSSI_REJECT_LIST(blm_entry)) - return CM_BLM_FORCE_REMOVE; + if (DLM_IS_AP_DENYLISTED_BY_USERSPACE(dlm_entry) || + DLM_IS_AP_IN_RSSI_REJECT_LIST(dlm_entry)) + return CM_DLM_FORCE_REMOVE; - return CM_BLM_REMOVE; + return CM_DLM_REMOVE; } - if (BLM_IS_AP_IN_AVOIDLIST(blm_entry)) { - blm_debug(QDF_MAC_ADDR_FMT" in avoid list, deprioritize it", - QDF_MAC_ADDR_REF(blm_entry->bssid.bytes)); - return CM_BLM_AVOID; + if (DLM_IS_AP_IN_AVOIDLIST(dlm_entry)) { + dlm_debug(QDF_MAC_ADDR_FMT " in avoid list, deprioritize it", + QDF_MAC_ADDR_REF(dlm_entry->bssid.bytes)); + return CM_DLM_AVOID; } - return CM_BLM_NO_ACTION; + return CM_DLM_NO_ACTION; } -static enum cm_blacklist_action -blm_action_on_bssid(struct wlan_objmgr_pdev *pdev, +static enum cm_denylist_action +dlm_action_on_bssid(struct wlan_objmgr_pdev *pdev, struct scan_cache_entry *entry) { - struct blm_pdev_priv_obj *blm_ctx; - struct blm_psoc_priv_obj *blm_psoc_obj; - struct blm_config *cfg; - struct blm_reject_ap *blm_entry = NULL; + struct dlm_pdev_priv_obj *dlm_ctx; + struct dlm_psoc_priv_obj *dlm_psoc_obj; + struct dlm_config *cfg; + struct dlm_reject_ap *dlm_entry = NULL; qdf_list_node_t *cur_node = NULL, *next_node = NULL; QDF_STATUS status; - enum cm_blacklist_action action = CM_BLM_NO_ACTION; + enum cm_denylist_action action = CM_DLM_NO_ACTION; - blm_ctx = blm_get_pdev_obj(pdev); - blm_psoc_obj = blm_get_psoc_obj(wlan_pdev_get_psoc(pdev)); - if (!blm_ctx || !blm_psoc_obj) { - blm_err("blm_ctx or blm_psoc_obj is NULL"); - return CM_BLM_NO_ACTION; + dlm_ctx = dlm_get_pdev_obj(pdev); + dlm_psoc_obj = dlm_get_psoc_obj(wlan_pdev_get_psoc(pdev)); + if (!dlm_ctx || !dlm_psoc_obj) { + dlm_err("dlm_ctx or dlm_psoc_obj is NULL"); + return CM_DLM_NO_ACTION; } - status = qdf_mutex_acquire(&blm_ctx->reject_ap_list_lock); + status = qdf_mutex_acquire(&dlm_ctx->reject_ap_list_lock); if (QDF_IS_STATUS_ERROR(status)) { - blm_err("failed to acquire reject_ap_list_lock"); - return CM_BLM_NO_ACTION; + dlm_err("failed to acquire reject_ap_list_lock"); + return CM_DLM_NO_ACTION; } - cfg = &blm_psoc_obj->blm_cfg; + cfg = &dlm_psoc_obj->dlm_cfg; - qdf_list_peek_front(&blm_ctx->reject_ap_list, &cur_node); + qdf_list_peek_front(&dlm_ctx->reject_ap_list, &cur_node); while (cur_node) { - qdf_list_peek_next(&blm_ctx->reject_ap_list, cur_node, + qdf_list_peek_next(&dlm_ctx->reject_ap_list, cur_node, &next_node); - blm_entry = qdf_container_of(cur_node, struct blm_reject_ap, - node); + dlm_entry = qdf_container_of(cur_node, struct dlm_reject_ap, + node); - if (qdf_is_macaddr_equal(&blm_entry->bssid, &entry->bssid)) { - action = blm_prune_old_entries_and_get_action(blm_entry, - cfg, entry, &blm_ctx->reject_ap_list); - qdf_mutex_release(&blm_ctx->reject_ap_list_lock); + if (qdf_is_macaddr_equal(&dlm_entry->bssid, &entry->bssid)) { + action = dlm_prune_old_entries_and_get_action(dlm_entry, + cfg, entry, &dlm_ctx->reject_ap_list); + qdf_mutex_release(&dlm_ctx->reject_ap_list_lock); return action; } cur_node = next_node; next_node = NULL; } - qdf_mutex_release(&blm_ctx->reject_ap_list_lock); + qdf_mutex_release(&dlm_ctx->reject_ap_list_lock); - return CM_BLM_NO_ACTION; + return CM_DLM_NO_ACTION; } -enum cm_blacklist_action -wlan_blacklist_action_on_bssid(struct wlan_objmgr_pdev *pdev, - struct scan_cache_entry *entry) +enum cm_denylist_action +wlan_denylist_action_on_bssid(struct wlan_objmgr_pdev *pdev, + struct scan_cache_entry *entry) { - return blm_action_on_bssid(pdev, entry); + return dlm_action_on_bssid(pdev, entry); } static void -blm_update_avoidlist_reject_reason(struct blm_reject_ap *entry, - enum blm_reject_ap_reason reject_reason) +dlm_update_avoidlist_reject_reason(struct dlm_reject_ap *entry, + enum dlm_reject_ap_reason reject_reason) { entry->nud_fail = false; entry->sta_kickout = false; entry->ho_fail = false; - switch(reject_reason) { + switch (reject_reason) { case REASON_NUD_FAILURE: entry->nud_fail = true; break; @@ -287,13 +288,13 @@ blm_update_avoidlist_reject_reason(struct blm_reject_ap *entry, entry->ho_fail = true; break; default: - blm_err("Invalid reason passed %d", reject_reason); + dlm_err("Invalid reason passed %d", reject_reason); } } static void -blm_handle_avoid_list(struct blm_reject_ap *entry, - struct blm_config *cfg, +dlm_handle_avoid_list(struct dlm_reject_ap *entry, + struct dlm_config *cfg, struct reject_ap_info *ap_info) { qdf_time_t cur_timestamp = qdf_mc_timer_get_system_time(); @@ -304,7 +305,7 @@ blm_handle_avoid_list(struct blm_reject_ap *entry, entry->ap_timestamp.userspace_avoid_timestamp = cur_timestamp; } else if (ap_info->reject_ap_type == DRIVER_AVOID_TYPE) { entry->driver_avoidlist = true; - blm_update_avoidlist_reject_reason(entry, + dlm_update_avoidlist_reject_reason(entry, ap_info->reject_reason); entry->ap_timestamp.driver_avoid_timestamp = cur_timestamp; } else { @@ -320,22 +321,23 @@ blm_handle_avoid_list(struct blm_reject_ap *entry, /* Increment bad bssid counter as NUD failure happenend with this ap */ entry->bad_bssid_counter++; - /* If bad bssid counter has reached threshold, move it to blacklist */ + /* If bad bssid counter has reached threshold, move it to denylist */ if (entry->bad_bssid_counter >= cfg->bad_bssid_counter_thresh) { if (ap_info->reject_ap_type == USERSPACE_AVOID_TYPE) entry->userspace_avoidlist = false; else if (ap_info->reject_ap_type == DRIVER_AVOID_TYPE) entry->driver_avoidlist = false; - /* Move AP to blacklist list */ - entry->driver_blacklist = true; - entry->ap_timestamp.driver_blacklist_timestamp = cur_timestamp; + /* Move AP to denylist list */ + entry->driver_denylist = true; + entry->ap_timestamp.driver_denylist_timestamp = cur_timestamp; - blm_debug(QDF_MAC_ADDR_FMT" moved to black list with counter %d", - QDF_MAC_ADDR_REF(entry->bssid.bytes), entry->bad_bssid_counter); + dlm_debug(QDF_MAC_ADDR_FMT " moved to deny list with counter %d", + QDF_MAC_ADDR_REF(entry->bssid.bytes), + entry->bad_bssid_counter); return; } - blm_debug("Added "QDF_MAC_ADDR_FMT" to avoid list type %d, counter %d reason %d updated reject reason %d source %d", + dlm_debug("Added " QDF_MAC_ADDR_FMT " to avoid list type %d, counter %d reason %d updated reject reason %d source %d", QDF_MAC_ADDR_REF(entry->bssid.bytes), ap_info->reject_ap_type, entry->bad_bssid_counter, ap_info->reject_reason, entry->reject_ap_reason, entry->source); @@ -344,29 +346,29 @@ blm_handle_avoid_list(struct blm_reject_ap *entry, } static void -blm_handle_blacklist(struct blm_reject_ap *entry, - struct reject_ap_info *ap_info) +dlm_handle_denylist(struct dlm_reject_ap *entry, + struct reject_ap_info *ap_info) { /* - * No entity will blacklist an AP internal to driver, so only - * userspace blacklist is the case to be taken care. Driver blacklist + * No entity will denylist an AP internal to driver, so only + * userspace denylist is the case to be taken care. Driver denylist * will only happen when the bad bssid counter has reached the max * threshold. */ entry->bssid = ap_info->bssid; - entry->userspace_blacklist = true; - entry->ap_timestamp.userspace_blacklist_timestamp = + entry->userspace_denylist = true; + entry->ap_timestamp.userspace_denylist_timestamp = qdf_mc_timer_get_system_time(); entry->source = ADDED_BY_DRIVER; - entry->blacklist_userspace = true; - blm_debug(QDF_MAC_ADDR_FMT" added to userspace blacklist", + entry->denylist_userspace = true; + dlm_debug(QDF_MAC_ADDR_FMT " added to userspace denylist", QDF_MAC_ADDR_REF(entry->bssid.bytes)); } static void -blm_update_rssi_reject_reason(struct blm_reject_ap *entry, - enum blm_reject_ap_reason reject_reason) +dlm_update_rssi_reject_reason(struct dlm_reject_ap *entry, + enum dlm_reject_ap_reason reject_reason) { entry->poor_rssi = false; entry->oce_assoc_reject = false; @@ -376,7 +378,7 @@ blm_update_rssi_reject_reason(struct blm_reject_ap *entry, entry->no_more_stas = false; entry->reassoc_rssi_reject = false; - switch(reject_reason) { + switch (reject_reason) { case REASON_ASSOC_REJECT_POOR_RSSI: entry->poor_rssi = true; break; @@ -399,12 +401,12 @@ blm_update_rssi_reject_reason(struct blm_reject_ap *entry, entry->no_more_stas = true; break; default: - blm_err("Invalid reason passed %d", reject_reason); + dlm_err("Invalid reason passed %d", reject_reason); } } static void -blm_handle_rssi_reject_list(struct blm_reject_ap *entry, +dlm_handle_rssi_reject_list(struct dlm_reject_ap *entry, struct reject_ap_info *ap_info) { bool bssid_newly_added; @@ -421,8 +423,8 @@ blm_handle_rssi_reject_list(struct blm_reject_ap *entry, entry->ap_timestamp.rssi_reject_timestamp = qdf_mc_timer_get_system_time(); entry->rssi_reject_params = ap_info->rssi_reject_params; - blm_update_rssi_reject_reason(entry, ap_info->reject_reason); - blm_info(QDF_MAC_ADDR_FMT" %s to rssi reject list, expected RSSI %d retry delay %u source %d original timeout %u received time %lu reject reason %d updated reason %d", + dlm_update_rssi_reject_reason(entry, ap_info->reject_reason); + dlm_info(QDF_MAC_ADDR_FMT " %s to rssi reject list, expected RSSI %d retry delay %u source %d original timeout %u received time %lu reject reason %d updated reason %d", QDF_MAC_ADDR_REF(entry->bssid.bytes), bssid_newly_added ? "ADDED" : "UPDATED", entry->rssi_reject_params.expected_rssi, @@ -434,77 +436,77 @@ blm_handle_rssi_reject_list(struct blm_reject_ap *entry, } static void -blm_modify_entry(struct blm_reject_ap *entry, struct blm_config *cfg, +dlm_modify_entry(struct dlm_reject_ap *entry, struct dlm_config *cfg, struct reject_ap_info *ap_info) { /* Modify the entry according to the ap_info */ switch (ap_info->reject_ap_type) { case USERSPACE_AVOID_TYPE: case DRIVER_AVOID_TYPE: - blm_handle_avoid_list(entry, cfg, ap_info); + dlm_handle_avoid_list(entry, cfg, ap_info); break; - case USERSPACE_BLACKLIST_TYPE: - blm_handle_blacklist(entry, ap_info); + case USERSPACE_DENYLIST_TYPE: + dlm_handle_denylist(entry, ap_info); break; case DRIVER_RSSI_REJECT_TYPE: - blm_handle_rssi_reject_list(entry, ap_info); + dlm_handle_rssi_reject_list(entry, ap_info); break; default: - blm_debug("Invalid input of ap type %d", + dlm_debug("Invalid input of ap type %d", ap_info->reject_ap_type); } } static bool -blm_is_bssid_present_only_in_list_type(enum blm_reject_ap_type list_type, - struct blm_reject_ap *blm_entry) +dlm_is_bssid_present_only_in_list_type(enum dlm_reject_ap_type list_type, + struct dlm_reject_ap *dlm_entry) { switch (list_type) { case USERSPACE_AVOID_TYPE: - return IS_AP_IN_USERSPACE_AVOID_LIST_ONLY(blm_entry); - case USERSPACE_BLACKLIST_TYPE: - return IS_AP_IN_USERSPACE_BLACKLIST_ONLY(blm_entry); + return IS_AP_IN_USERSPACE_AVOID_LIST_ONLY(dlm_entry); + case USERSPACE_DENYLIST_TYPE: + return IS_AP_IN_USERSPACE_DENYLIST_ONLY(dlm_entry); case DRIVER_AVOID_TYPE: - return IS_AP_IN_DRIVER_AVOID_LIST_ONLY(blm_entry); - case DRIVER_BLACKLIST_TYPE: - return IS_AP_IN_DRIVER_BLACKLIST_ONLY(blm_entry); + return IS_AP_IN_DRIVER_AVOID_LIST_ONLY(dlm_entry); + case DRIVER_DENYLIST_TYPE: + return IS_AP_IN_DRIVER_DENYLIST_ONLY(dlm_entry); case DRIVER_RSSI_REJECT_TYPE: - return IS_AP_IN_RSSI_REJECT_LIST_ONLY(blm_entry); + return IS_AP_IN_RSSI_REJECT_LIST_ONLY(dlm_entry); case DRIVER_MONITOR_TYPE: - return IS_AP_IN_MONITOR_LIST_ONLY(blm_entry); + return IS_AP_IN_MONITOR_LIST_ONLY(dlm_entry); default: - blm_debug("Wrong list type %d passed", list_type); + dlm_debug("Wrong list type %d passed", list_type); return false; } } static bool -blm_is_bssid_of_type(enum blm_reject_ap_type reject_ap_type, - struct blm_reject_ap *blm_entry) +dlm_is_bssid_of_type(enum dlm_reject_ap_type reject_ap_type, + struct dlm_reject_ap *dlm_entry) { switch (reject_ap_type) { case USERSPACE_AVOID_TYPE: - return BLM_IS_AP_AVOIDED_BY_USERSPACE(blm_entry); - case USERSPACE_BLACKLIST_TYPE: - return BLM_IS_AP_BLACKLISTED_BY_USERSPACE(blm_entry); + return DLM_IS_AP_AVOIDED_BY_USERSPACE(dlm_entry); + case USERSPACE_DENYLIST_TYPE: + return DLM_IS_AP_DENYLISTED_BY_USERSPACE(dlm_entry); case DRIVER_AVOID_TYPE: - return BLM_IS_AP_AVOIDED_BY_DRIVER(blm_entry); - case DRIVER_BLACKLIST_TYPE: - return BLM_IS_AP_BLACKLISTED_BY_DRIVER(blm_entry); + return DLM_IS_AP_AVOIDED_BY_DRIVER(dlm_entry); + case DRIVER_DENYLIST_TYPE: + return DLM_IS_AP_DENYLISTED_BY_DRIVER(dlm_entry); case DRIVER_RSSI_REJECT_TYPE: - return BLM_IS_AP_IN_RSSI_REJECT_LIST(blm_entry); + return DLM_IS_AP_IN_RSSI_REJECT_LIST(dlm_entry); case DRIVER_MONITOR_TYPE: - return BLM_IS_AP_IN_MONITOR_LIST(blm_entry); + return DLM_IS_AP_IN_MONITOR_LIST(dlm_entry); default: - blm_err("Wrong list type %d passed", reject_ap_type); + dlm_err("Wrong list type %d passed", reject_ap_type); return false; } } static qdf_time_t -blm_get_delta_of_bssid(enum blm_reject_ap_type list_type, - struct blm_reject_ap *blm_entry, - struct blm_config *cfg) +dlm_get_delta_of_bssid(enum dlm_reject_ap_type list_type, + struct dlm_reject_ap *dlm_entry, + struct dlm_config *cfg) { qdf_time_t cur_timestamp = qdf_mc_timer_get_system_time(); int32_t disallowed_time; @@ -518,52 +520,54 @@ blm_get_delta_of_bssid(enum blm_reject_ap_type list_type, case USERSPACE_AVOID_TYPE: return MINUTES_TO_MS(cfg->avoid_list_exipry_time) - (cur_timestamp - - blm_entry->ap_timestamp.userspace_avoid_timestamp); - case USERSPACE_BLACKLIST_TYPE: + dlm_entry->ap_timestamp.userspace_avoid_timestamp); + case USERSPACE_DENYLIST_TYPE: return cur_timestamp - - blm_entry->ap_timestamp.userspace_blacklist_timestamp; + dlm_entry->ap_timestamp.userspace_denylist_timestamp; case DRIVER_AVOID_TYPE: return MINUTES_TO_MS(cfg->avoid_list_exipry_time) - (cur_timestamp - - blm_entry->ap_timestamp.driver_avoid_timestamp); - case DRIVER_BLACKLIST_TYPE: - return MINUTES_TO_MS(cfg->black_list_exipry_time) - + dlm_entry->ap_timestamp.driver_avoid_timestamp); + case DRIVER_DENYLIST_TYPE: + return MINUTES_TO_MS(cfg->deny_list_exipry_time) - (cur_timestamp - - blm_entry->ap_timestamp.driver_blacklist_timestamp); + dlm_entry->ap_timestamp.driver_denylist_timestamp); /* * For RSSI reject lowest delta would be the BSSID whose retry delay * is about to expire, hence the delta would be remaining duration for - * de-blacklisting the AP from rssi reject list. + * de-denylisting the AP from rssi reject list. */ case DRIVER_RSSI_REJECT_TYPE: - if (blm_entry->rssi_reject_params.retry_delay) + if (dlm_entry->rssi_reject_params.retry_delay) disallowed_time = - blm_entry->rssi_reject_params.retry_delay - + dlm_entry->rssi_reject_params.retry_delay - (cur_timestamp - - blm_entry->ap_timestamp.rssi_reject_timestamp); + dlm_entry->ap_timestamp.rssi_reject_timestamp); else - disallowed_time = (int32_t)(MINUTES_TO_MS(RSSI_TIMEOUT_VALUE) - + disallowed_time = + (int32_t)(MINUTES_TO_MS(RSSI_TIMEOUT_VALUE) - (cur_timestamp - - blm_entry->ap_timestamp.rssi_reject_timestamp)); + dlm_entry->ap_timestamp.rssi_reject_timestamp) + ); return ((disallowed_time < 0) ? 0 : disallowed_time); case DRIVER_MONITOR_TYPE: return cur_timestamp - - blm_entry->ap_timestamp.driver_monitor_timestamp; + dlm_entry->ap_timestamp.driver_monitor_timestamp; default: - blm_debug("Wrong list type %d passed", list_type); + dlm_debug("Wrong list type %d passed", list_type); return 0; } } static bool -blm_is_oldest_entry(enum blm_reject_ap_type list_type, +dlm_is_oldest_entry(enum dlm_reject_ap_type list_type, qdf_time_t cur_node_delta, qdf_time_t oldest_node_delta) { switch (list_type) { /* - * For RSSI reject, userspace avoid, driver avoid/blacklist type the + * For RSSI reject, userspace avoid, driver avoid/denylist type the * lowest retry delay has to be found out hence if oldest_node_delta is * 0, mean this is the first entry and thus return true, If * oldest_node_delta is non zero, compare the delta and return true if @@ -572,17 +576,17 @@ blm_is_oldest_entry(enum blm_reject_ap_type list_type, case DRIVER_RSSI_REJECT_TYPE: case USERSPACE_AVOID_TYPE: case DRIVER_AVOID_TYPE: - case DRIVER_BLACKLIST_TYPE: - if (!oldest_node_delta || (cur_node_delta < oldest_node_delta)) + case DRIVER_DENYLIST_TYPE: + if (!oldest_node_delta || cur_node_delta < oldest_node_delta) return true; break; - case USERSPACE_BLACKLIST_TYPE: + case USERSPACE_DENYLIST_TYPE: case DRIVER_MONITOR_TYPE: if (cur_node_delta > oldest_node_delta) return true; break; default: - blm_debug("Wrong list type passed %d", list_type); + dlm_debug("Wrong list type passed %d", list_type); return false; } @@ -590,13 +594,13 @@ blm_is_oldest_entry(enum blm_reject_ap_type list_type, } static QDF_STATUS -blm_try_delete_bssid_in_list(qdf_list_t *reject_ap_list, - enum blm_reject_ap_type list_type, - struct blm_config *cfg) +dlm_try_delete_bssid_in_list(qdf_list_t *reject_ap_list, + enum dlm_reject_ap_type list_type, + struct dlm_config *cfg) { - struct blm_reject_ap *blm_entry = NULL; + struct dlm_reject_ap *dlm_entry = NULL; qdf_list_node_t *cur_node = NULL, *next_node = NULL; - struct blm_reject_ap *oldest_blm_entry = NULL; + struct dlm_reject_ap *oldest_dlm_entry = NULL; qdf_time_t oldest_node_delta = 0; qdf_time_t cur_node_delta = 0; @@ -605,18 +609,18 @@ blm_try_delete_bssid_in_list(qdf_list_t *reject_ap_list, while (cur_node) { qdf_list_peek_next(reject_ap_list, cur_node, &next_node); - blm_entry = qdf_container_of(cur_node, struct blm_reject_ap, - node); + dlm_entry = qdf_container_of(cur_node, struct dlm_reject_ap, + node); - if (blm_is_bssid_present_only_in_list_type(list_type, - blm_entry)) { - cur_node_delta = blm_get_delta_of_bssid(list_type, - blm_entry, cfg); + if (dlm_is_bssid_present_only_in_list_type(list_type, + dlm_entry)) { + cur_node_delta = dlm_get_delta_of_bssid(list_type, + dlm_entry, cfg); - if (blm_is_oldest_entry(list_type, cur_node_delta, + if (dlm_is_oldest_entry(list_type, cur_node_delta, oldest_node_delta)) { /* now this is the oldest entry*/ - oldest_blm_entry = blm_entry; + oldest_dlm_entry = dlm_entry; oldest_node_delta = cur_node_delta; } } @@ -624,13 +628,13 @@ blm_try_delete_bssid_in_list(qdf_list_t *reject_ap_list, next_node = NULL; } - if (oldest_blm_entry) { + if (oldest_dlm_entry) { /* Remove this entry to make space for the next entry */ - blm_debug("Removed "QDF_MAC_ADDR_FMT", type = %d", - QDF_MAC_ADDR_REF(oldest_blm_entry->bssid.bytes), + dlm_debug("Removed " QDF_MAC_ADDR_FMT ", type = %d", + QDF_MAC_ADDR_REF(oldest_dlm_entry->bssid.bytes), list_type); - qdf_list_remove_node(reject_ap_list, &oldest_blm_entry->node); - qdf_mem_free(oldest_blm_entry); + qdf_list_remove_node(reject_ap_list, &oldest_dlm_entry->node); + qdf_mem_free(oldest_dlm_entry); return QDF_STATUS_SUCCESS; } /* If the flow has reached here, that means no entry could be removed */ @@ -639,8 +643,8 @@ blm_try_delete_bssid_in_list(qdf_list_t *reject_ap_list, } static QDF_STATUS -blm_remove_lowest_delta_entry(qdf_list_t *reject_ap_list, - struct blm_config *cfg) +dlm_remove_lowest_delta_entry(qdf_list_t *reject_ap_list, + struct dlm_config *cfg) { QDF_STATUS status; @@ -652,258 +656,260 @@ blm_remove_lowest_delta_entry(qdf_list_t *reject_ap_list, * 2. Driver avoid list * 3. Userspace avoid list. * 4. RSSI reject list. - * 5. Driver Blacklist. - * 6. Userspace Blacklist. + * 5. Driver Denylist. + * 6. Userspace Denylist. */ - status = blm_try_delete_bssid_in_list(reject_ap_list, + status = dlm_try_delete_bssid_in_list(reject_ap_list, DRIVER_MONITOR_TYPE, cfg); if (QDF_IS_STATUS_SUCCESS(status)) return QDF_STATUS_SUCCESS; - status = blm_try_delete_bssid_in_list(reject_ap_list, + status = dlm_try_delete_bssid_in_list(reject_ap_list, DRIVER_AVOID_TYPE, cfg); if (QDF_IS_STATUS_SUCCESS(status)) return QDF_STATUS_SUCCESS; - status = blm_try_delete_bssid_in_list(reject_ap_list, + status = dlm_try_delete_bssid_in_list(reject_ap_list, USERSPACE_AVOID_TYPE, cfg); if (QDF_IS_STATUS_SUCCESS(status)) return QDF_STATUS_SUCCESS; - status = blm_try_delete_bssid_in_list(reject_ap_list, + status = dlm_try_delete_bssid_in_list(reject_ap_list, DRIVER_RSSI_REJECT_TYPE, cfg); if (QDF_IS_STATUS_SUCCESS(status)) return QDF_STATUS_SUCCESS; - status = blm_try_delete_bssid_in_list(reject_ap_list, - DRIVER_BLACKLIST_TYPE, cfg); + status = dlm_try_delete_bssid_in_list(reject_ap_list, + DRIVER_DENYLIST_TYPE, cfg); if (QDF_IS_STATUS_SUCCESS(status)) return QDF_STATUS_SUCCESS; - status = blm_try_delete_bssid_in_list(reject_ap_list, - USERSPACE_BLACKLIST_TYPE, cfg); + status = dlm_try_delete_bssid_in_list(reject_ap_list, + USERSPACE_DENYLIST_TYPE, cfg); if (QDF_IS_STATUS_SUCCESS(status)) return QDF_STATUS_SUCCESS; - blm_debug("Failed to remove AP from blacklist manager"); + dlm_debug("Failed to remove AP from denylist manager"); return QDF_STATUS_E_FAILURE; } -static enum blm_reject_ap_reason -blm_get_rssi_reject_reason(struct blm_reject_ap *blm_entry) +static enum dlm_reject_ap_reason +dlm_get_rssi_reject_reason(struct dlm_reject_ap *dlm_entry) { - if (blm_entry->poor_rssi) + if (dlm_entry->poor_rssi) return REASON_ASSOC_REJECT_POOR_RSSI; - else if (blm_entry->oce_assoc_reject) + else if (dlm_entry->oce_assoc_reject) return REASON_ASSOC_REJECT_OCE; - else if(blm_entry->btm_bss_termination) + else if (dlm_entry->btm_bss_termination) return REASON_BTM_BSS_TERMINATION; - else if (blm_entry->btm_disassoc_imminent) + else if (dlm_entry->btm_disassoc_imminent) return REASON_BTM_DISASSOC_IMMINENT; - else if (blm_entry->btm_mbo_retry) + else if (dlm_entry->btm_mbo_retry) return REASON_BTM_MBO_RETRY; - else if (blm_entry->no_more_stas) + else if (dlm_entry->no_more_stas) return REASON_REASSOC_NO_MORE_STAS; - else if (blm_entry->reassoc_rssi_reject) + else if (dlm_entry->reassoc_rssi_reject) return REASON_REASSOC_RSSI_REJECT; return REASON_UNKNOWN; } static void -blm_fill_rssi_reject_params(struct blm_reject_ap *blm_entry, - enum blm_reject_ap_type reject_ap_type, - struct reject_ap_config_params *blm_reject_list) +dlm_fill_rssi_reject_params(struct dlm_reject_ap *dlm_entry, + enum dlm_reject_ap_type reject_ap_type, + struct reject_ap_config_params *dlm_reject_list) { if (reject_ap_type != DRIVER_RSSI_REJECT_TYPE) return; - blm_reject_list->source = blm_entry->rssi_reject_params.source; - blm_reject_list->original_timeout = - blm_entry->rssi_reject_params.original_timeout; - blm_reject_list->received_time = - blm_entry->rssi_reject_params.received_time; - blm_reject_list->reject_reason = blm_get_rssi_reject_reason(blm_entry); - blm_debug(QDF_MAC_ADDR_FMT" source %d original timeout %u received time %lu reject reason %d", - QDF_MAC_ADDR_REF(blm_entry->bssid.bytes), blm_reject_list->source, - blm_reject_list->original_timeout, - blm_reject_list->received_time, - blm_reject_list->reject_reason); + dlm_reject_list->source = dlm_entry->rssi_reject_params.source; + dlm_reject_list->original_timeout = + dlm_entry->rssi_reject_params.original_timeout; + dlm_reject_list->received_time = + dlm_entry->rssi_reject_params.received_time; + dlm_reject_list->reject_reason = dlm_get_rssi_reject_reason(dlm_entry); + dlm_debug(QDF_MAC_ADDR_FMT " source %d original timeout %u received time %lu reject reason %d", + QDF_MAC_ADDR_REF(dlm_entry->bssid.bytes), + dlm_reject_list->source, + dlm_reject_list->original_timeout, + dlm_reject_list->received_time, + dlm_reject_list->reject_reason); } /** - * blm_find_reject_type_string() - Function to convert int to string - * @reject_ap_type: blm_reject_ap_type + * dlm_find_reject_type_string() - Function to convert int to string + * @reject_ap_type: dlm_reject_ap_type * - * This function is used to convert int value of enum blm_reject_ap_type + * This function is used to convert int value of enum dlm_reject_ap_type * to string format. * * Return: String * */ static const char * -blm_find_reject_type_string(enum blm_reject_ap_type reject_ap_type) +dlm_find_reject_type_string(enum dlm_reject_ap_type reject_ap_type) { switch (reject_ap_type) { CASE_RETURN_STRING(USERSPACE_AVOID_TYPE); - CASE_RETURN_STRING(USERSPACE_BLACKLIST_TYPE); + CASE_RETURN_STRING(USERSPACE_DENYLIST_TYPE); CASE_RETURN_STRING(DRIVER_AVOID_TYPE); - CASE_RETURN_STRING(DRIVER_BLACKLIST_TYPE); + CASE_RETURN_STRING(DRIVER_DENYLIST_TYPE); CASE_RETURN_STRING(DRIVER_RSSI_REJECT_TYPE); CASE_RETURN_STRING(DRIVER_MONITOR_TYPE); + /* fallthrough */ default: return "REJECT_REASON_UNKNOWN"; } } /** - * blm_get_reject_ap_type() - Function to find reject ap type - * @blm_entry: blm_reject_ap + * dlm_get_reject_ap_type() - Function to find reject ap type + * @dlm_entry: dlm_reject_ap * * This function is used to get reject ap type. * - * Return: blm_reject_ap_type + * Return: dlm_reject_ap_type * */ -static enum blm_reject_ap_type -blm_get_reject_ap_type(struct blm_reject_ap *blm_entry) +static enum dlm_reject_ap_type +dlm_get_reject_ap_type(struct dlm_reject_ap *dlm_entry) { - if (BLM_IS_AP_AVOIDED_BY_USERSPACE(blm_entry)) + if (DLM_IS_AP_AVOIDED_BY_USERSPACE(dlm_entry)) return USERSPACE_AVOID_TYPE; - if (BLM_IS_AP_BLACKLISTED_BY_USERSPACE(blm_entry)) - return USERSPACE_BLACKLIST_TYPE; - if (BLM_IS_AP_AVOIDED_BY_DRIVER(blm_entry)) + if (DLM_IS_AP_DENYLISTED_BY_USERSPACE(dlm_entry)) + return USERSPACE_DENYLIST_TYPE; + if (DLM_IS_AP_AVOIDED_BY_DRIVER(dlm_entry)) return DRIVER_AVOID_TYPE; - if (BLM_IS_AP_BLACKLISTED_BY_DRIVER(blm_entry)) - return DRIVER_BLACKLIST_TYPE; - if (BLM_IS_AP_IN_RSSI_REJECT_LIST(blm_entry)) + if (DLM_IS_AP_DENYLISTED_BY_DRIVER(dlm_entry)) + return DRIVER_DENYLIST_TYPE; + if (DLM_IS_AP_IN_RSSI_REJECT_LIST(dlm_entry)) return DRIVER_RSSI_REJECT_TYPE; - if (BLM_IS_AP_IN_MONITOR_LIST(blm_entry)) + if (DLM_IS_AP_IN_MONITOR_LIST(dlm_entry)) return DRIVER_MONITOR_TYPE; return REJECT_REASON_UNKNOWN; } /** - * blm_dump_blacklist_bssid() - Function to dump blacklisted bssid + * dlm_dump_denylist_bssid() - Function to dump denylisted bssid * @pdev: pdev object * - * This function is used to dump blacklisted bssid along with reject + * This function is used to dump denylisted bssid along with reject * ap type, source, delay and required rssi * * Return: None * */ -void blm_dump_blacklist_bssid(struct wlan_objmgr_pdev *pdev) +void dlm_dump_denylist_bssid(struct wlan_objmgr_pdev *pdev) { - struct blm_reject_ap *blm_entry = NULL; + struct dlm_reject_ap *dlm_entry = NULL; qdf_list_node_t *cur_node = NULL, *next_node = NULL; - struct blm_pdev_priv_obj *blm_ctx; - struct blm_psoc_priv_obj *blm_psoc_obj; + struct dlm_pdev_priv_obj *dlm_ctx; + struct dlm_psoc_priv_obj *dlm_psoc_obj; uint32_t reject_duration; - enum blm_reject_ap_type reject_ap_type; + enum dlm_reject_ap_type reject_ap_type; qdf_list_t *reject_db_list; QDF_STATUS status; - blm_ctx = blm_get_pdev_obj(pdev); - blm_psoc_obj = blm_get_psoc_obj(wlan_pdev_get_psoc(pdev)); + dlm_ctx = dlm_get_pdev_obj(pdev); + dlm_psoc_obj = dlm_get_psoc_obj(wlan_pdev_get_psoc(pdev)); - if (!blm_ctx || !blm_psoc_obj) { - blm_err("blm_ctx or blm_psoc_obj is NULL"); + if (!dlm_ctx || !dlm_psoc_obj) { + dlm_err("dlm_ctx or dlm_psoc_obj is NULL"); return; } - status = qdf_mutex_acquire(&blm_ctx->reject_ap_list_lock); + status = qdf_mutex_acquire(&dlm_ctx->reject_ap_list_lock); if (QDF_IS_STATUS_ERROR(status)) { - blm_err("failed to acquire reject_ap_list_lock"); + dlm_err("failed to acquire reject_ap_list_lock"); return; } - reject_db_list = &blm_ctx->reject_ap_list; + reject_db_list = &dlm_ctx->reject_ap_list; qdf_list_peek_front(reject_db_list, &cur_node); while (cur_node) { qdf_list_peek_next(reject_db_list, cur_node, &next_node); - blm_entry = qdf_container_of(cur_node, struct blm_reject_ap, + dlm_entry = qdf_container_of(cur_node, struct dlm_reject_ap, node); - reject_ap_type = blm_get_reject_ap_type(blm_entry); + reject_ap_type = dlm_get_reject_ap_type(dlm_entry); - reject_duration = blm_get_delta_of_bssid( - reject_ap_type, blm_entry, - &blm_psoc_obj->blm_cfg); + reject_duration = dlm_get_delta_of_bssid(reject_ap_type, + dlm_entry, + &dlm_psoc_obj->dlm_cfg); - blm_nofl_debug("BLACKLIST BSSID "QDF_MAC_ADDR_FMT" type %s retry delay %dms expected RSSI %d reject reason %d rejection source %d", - QDF_MAC_ADDR_REF(blm_entry->bssid.bytes), - blm_find_reject_type_string(reject_ap_type), + dlm_nofl_debug("DENYLIST BSSID " QDF_MAC_ADDR_FMT " type %s retry delay %dms expected RSSI %d reject reason %d rejection source %d", + QDF_MAC_ADDR_REF(dlm_entry->bssid.bytes), + dlm_find_reject_type_string(reject_ap_type), reject_duration, - blm_entry->rssi_reject_params.expected_rssi, - blm_entry->reject_ap_reason, - blm_entry->rssi_reject_params.source); + dlm_entry->rssi_reject_params.expected_rssi, + dlm_entry->reject_ap_reason, + dlm_entry->rssi_reject_params.source); cur_node = next_node; next_node = NULL; } - qdf_mutex_release(&blm_ctx->reject_ap_list_lock); + qdf_mutex_release(&dlm_ctx->reject_ap_list_lock); } -static void blm_fill_reject_list(qdf_list_t *reject_db_list, +static void dlm_fill_reject_list(qdf_list_t *reject_db_list, struct reject_ap_config_params *reject_list, uint8_t *num_of_reject_bssid, - enum blm_reject_ap_type reject_ap_type, + enum dlm_reject_ap_type reject_ap_type, uint8_t max_bssid_to_be_filled, - struct blm_config *cfg) + struct dlm_config *cfg) { - struct blm_reject_ap *blm_entry = NULL; + struct dlm_reject_ap *dlm_entry = NULL; qdf_list_node_t *cur_node = NULL, *next_node = NULL; qdf_list_peek_front(reject_db_list, &cur_node); while (cur_node) { if (*num_of_reject_bssid == max_bssid_to_be_filled) { - blm_debug("Max size reached in list, reject_ap_type %d", + dlm_debug("Max size reached in list, reject_ap_type %d", reject_ap_type); return; } qdf_list_peek_next(reject_db_list, cur_node, &next_node); - blm_entry = qdf_container_of(cur_node, struct blm_reject_ap, - node); + dlm_entry = qdf_container_of(cur_node, struct dlm_reject_ap, + node); - blm_update_ap_info(blm_entry, cfg, NULL); - if (!blm_entry->reject_ap_type) { - blm_debug(QDF_MAC_ADDR_FMT" cleared from list", - QDF_MAC_ADDR_REF(blm_entry->bssid.bytes)); - qdf_list_remove_node(reject_db_list, &blm_entry->node); - qdf_mem_free(blm_entry); + dlm_update_ap_info(dlm_entry, cfg, NULL); + if (!dlm_entry->reject_ap_type) { + dlm_debug(QDF_MAC_ADDR_FMT " cleared from list", + QDF_MAC_ADDR_REF(dlm_entry->bssid.bytes)); + qdf_list_remove_node(reject_db_list, &dlm_entry->node); + qdf_mem_free(dlm_entry); cur_node = next_node; next_node = NULL; continue; } - if (blm_is_bssid_of_type(reject_ap_type, blm_entry)) { - struct reject_ap_config_params *blm_reject_list; + if (dlm_is_bssid_of_type(reject_ap_type, dlm_entry)) { + struct reject_ap_config_params *dlm_reject_list; - blm_reject_list = &reject_list[*num_of_reject_bssid]; - blm_reject_list->expected_rssi = - blm_entry->rssi_reject_params.expected_rssi; - blm_reject_list->reject_duration = - blm_get_delta_of_bssid(reject_ap_type, blm_entry, + dlm_reject_list = &reject_list[*num_of_reject_bssid]; + dlm_reject_list->expected_rssi = + dlm_entry->rssi_reject_params.expected_rssi; + dlm_reject_list->reject_duration = + dlm_get_delta_of_bssid(reject_ap_type, dlm_entry, cfg); - blm_fill_rssi_reject_params(blm_entry, reject_ap_type, - blm_reject_list); - blm_reject_list->reject_ap_type = reject_ap_type; - blm_reject_list->bssid = blm_entry->bssid; + dlm_fill_rssi_reject_params(dlm_entry, reject_ap_type, + dlm_reject_list); + dlm_reject_list->reject_ap_type = reject_ap_type; + dlm_reject_list->bssid = dlm_entry->bssid; (*num_of_reject_bssid)++; - blm_debug("Adding BSSID "QDF_MAC_ADDR_FMT" of type %d retry delay %d expected RSSI %d, entries added = %d reject reason %d", - QDF_MAC_ADDR_REF(blm_entry->bssid.bytes), + dlm_debug("Adding BSSID " QDF_MAC_ADDR_FMT " of type %d retry delay %d expected RSSI %d, entries added = %d reject reason %d", + QDF_MAC_ADDR_REF(dlm_entry->bssid.bytes), reject_ap_type, - reject_list[*num_of_reject_bssid -1].reject_duration, - blm_entry->rssi_reject_params.expected_rssi, + reject_list[*num_of_reject_bssid - 1].reject_duration, + dlm_entry->rssi_reject_params.expected_rssi, *num_of_reject_bssid, - blm_entry->reject_ap_reason); + dlm_entry->reject_ap_reason); } cur_node = next_node; next_node = NULL; @@ -911,75 +917,75 @@ static void blm_fill_reject_list(qdf_list_t *reject_db_list, } #if defined(WLAN_FEATURE_ROAM_OFFLOAD) -void blm_update_reject_ap_list_to_fw(struct wlan_objmgr_psoc *psoc) +void dlm_update_reject_ap_list_to_fw(struct wlan_objmgr_psoc *psoc) { - struct blm_config *cfg; + struct dlm_config *cfg; struct wlan_objmgr_pdev *pdev; - struct blm_pdev_priv_obj *blm_ctx; - struct blm_psoc_priv_obj *blm_psoc_obj; + struct dlm_pdev_priv_obj *dlm_ctx; + struct dlm_psoc_priv_obj *dlm_psoc_obj; QDF_STATUS status; - blm_psoc_obj = blm_get_psoc_obj(psoc); - if (!blm_psoc_obj) { - blm_err("BLM psoc obj NULL"); + dlm_psoc_obj = dlm_get_psoc_obj(psoc); + if (!dlm_psoc_obj) { + dlm_err("DLM psoc obj NULL"); return; } - pdev = wlan_objmgr_get_pdev_by_id(psoc, blm_psoc_obj->pdev_id, + pdev = wlan_objmgr_get_pdev_by_id(psoc, dlm_psoc_obj->pdev_id, WLAN_MLME_CM_ID); if (!pdev) { - blm_err("pdev obj NULL"); + dlm_err("pdev obj NULL"); return; } - blm_ctx = blm_get_pdev_obj(pdev); - if (!blm_ctx) { - blm_err("BLM pdev obj NULL"); + dlm_ctx = dlm_get_pdev_obj(pdev); + if (!dlm_ctx) { + dlm_err("DLM pdev obj NULL"); goto end; } - status = qdf_mutex_acquire(&blm_ctx->reject_ap_list_lock); + status = qdf_mutex_acquire(&dlm_ctx->reject_ap_list_lock); if (QDF_IS_STATUS_ERROR(status)) { - blm_err("failed to acquire reject_ap_list_lock"); + dlm_err("failed to acquire reject_ap_list_lock"); goto end; } - cfg = &blm_psoc_obj->blm_cfg; - blm_send_reject_ap_list_to_fw(pdev, &blm_ctx->reject_ap_list, cfg); - qdf_mutex_release(&blm_ctx->reject_ap_list_lock); + cfg = &dlm_psoc_obj->dlm_cfg; + dlm_send_reject_ap_list_to_fw(pdev, &dlm_ctx->reject_ap_list, cfg); + qdf_mutex_release(&dlm_ctx->reject_ap_list_lock); end: wlan_objmgr_pdev_release_ref(pdev, WLAN_MLME_CM_ID); } -static void blm_store_pdevid_in_blm_psocpriv(struct wlan_objmgr_pdev *pdev) +static void dlm_store_pdevid_in_dlm_psocpriv(struct wlan_objmgr_pdev *pdev) { - struct blm_psoc_priv_obj *blm_psoc_obj; + struct dlm_psoc_priv_obj *dlm_psoc_obj; - blm_psoc_obj = blm_get_psoc_obj(wlan_pdev_get_psoc(pdev)); + dlm_psoc_obj = dlm_get_psoc_obj(wlan_pdev_get_psoc(pdev)); - if (!blm_psoc_obj) { - blm_err("BLM psoc obj NULL"); + if (!dlm_psoc_obj) { + dlm_err("DLM psoc obj NULL"); return; } - blm_psoc_obj->pdev_id = pdev->pdev_objmgr.wlan_pdev_id; + dlm_psoc_obj->pdev_id = pdev->pdev_objmgr.wlan_pdev_id; } void -blm_send_reject_ap_list_to_fw(struct wlan_objmgr_pdev *pdev, +dlm_send_reject_ap_list_to_fw(struct wlan_objmgr_pdev *pdev, qdf_list_t *reject_db_list, - struct blm_config *cfg) + struct dlm_config *cfg) { QDF_STATUS status; - bool is_blm_suspended; + bool is_dlm_suspended; struct reject_ap_params reject_params = {0}; - ucfg_blm_psoc_get_suspended(wlan_pdev_get_psoc(pdev), - &is_blm_suspended); - if (is_blm_suspended) { - blm_store_pdevid_in_blm_psocpriv(pdev); - blm_debug("Failed to send reject AP list to FW as BLM is suspended"); + ucfg_dlm_psoc_get_suspended(wlan_pdev_get_psoc(pdev), + &is_dlm_suspended); + if (is_dlm_suspended) { + dlm_store_pdevid_in_dlm_psocpriv(pdev); + dlm_debug("Failed to send reject AP list to FW as DLM is suspended"); return; } @@ -990,93 +996,93 @@ blm_send_reject_ap_list_to_fw(struct wlan_objmgr_pdev *pdev, return; /* The priority for filling is as below */ - blm_fill_reject_list(reject_db_list, reject_params.bssid_list, + dlm_fill_reject_list(reject_db_list, reject_params.bssid_list, &reject_params.num_of_reject_bssid, - USERSPACE_BLACKLIST_TYPE, + USERSPACE_DENYLIST_TYPE, PDEV_MAX_NUM_BSSID_DISALLOW_LIST, cfg); - blm_fill_reject_list(reject_db_list, reject_params.bssid_list, + dlm_fill_reject_list(reject_db_list, reject_params.bssid_list, &reject_params.num_of_reject_bssid, - DRIVER_BLACKLIST_TYPE, + DRIVER_DENYLIST_TYPE, PDEV_MAX_NUM_BSSID_DISALLOW_LIST, cfg); - blm_fill_reject_list(reject_db_list, reject_params.bssid_list, + dlm_fill_reject_list(reject_db_list, reject_params.bssid_list, &reject_params.num_of_reject_bssid, DRIVER_RSSI_REJECT_TYPE, PDEV_MAX_NUM_BSSID_DISALLOW_LIST, cfg); - blm_fill_reject_list(reject_db_list, reject_params.bssid_list, + dlm_fill_reject_list(reject_db_list, reject_params.bssid_list, &reject_params.num_of_reject_bssid, USERSPACE_AVOID_TYPE, PDEV_MAX_NUM_BSSID_DISALLOW_LIST, cfg); - blm_fill_reject_list(reject_db_list, reject_params.bssid_list, + dlm_fill_reject_list(reject_db_list, reject_params.bssid_list, &reject_params.num_of_reject_bssid, DRIVER_AVOID_TYPE, PDEV_MAX_NUM_BSSID_DISALLOW_LIST, cfg); - status = tgt_blm_send_reject_list_to_fw(pdev, &reject_params); + status = tgt_dlm_send_reject_list_to_fw(pdev, &reject_params); if (QDF_IS_STATUS_ERROR(status)) - blm_err("failed to send the reject Ap list to FW"); + dlm_err("failed to send the reject Ap list to FW"); qdf_mem_free(reject_params.bssid_list); } #endif QDF_STATUS -blm_add_bssid_to_reject_list(struct wlan_objmgr_pdev *pdev, +dlm_add_bssid_to_reject_list(struct wlan_objmgr_pdev *pdev, struct reject_ap_info *ap_info) { - struct blm_pdev_priv_obj *blm_ctx; - struct blm_psoc_priv_obj *blm_psoc_obj; - struct blm_config *cfg; - struct blm_reject_ap *blm_entry; + struct dlm_pdev_priv_obj *dlm_ctx; + struct dlm_psoc_priv_obj *dlm_psoc_obj; + struct dlm_config *cfg; + struct dlm_reject_ap *dlm_entry; qdf_list_node_t *cur_node = NULL, *next_node = NULL; QDF_STATUS status; - blm_ctx = blm_get_pdev_obj(pdev); - blm_psoc_obj = blm_get_psoc_obj(wlan_pdev_get_psoc(pdev)); + dlm_ctx = dlm_get_pdev_obj(pdev); + dlm_psoc_obj = dlm_get_psoc_obj(wlan_pdev_get_psoc(pdev)); - if (!blm_ctx || !blm_psoc_obj) { - blm_err("blm_ctx or blm_psoc_obj is NULL"); + if (!dlm_ctx || !dlm_psoc_obj) { + dlm_err("dlm_ctx or dlm_psoc_obj is NULL"); return QDF_STATUS_E_INVAL; } if (qdf_is_macaddr_zero(&ap_info->bssid) || qdf_is_macaddr_group(&ap_info->bssid)) { - blm_err("Zero/Broadcast BSSID received, entry not added"); + dlm_err("Zero/Broadcast BSSID received, entry not added"); return QDF_STATUS_E_INVAL; } - status = qdf_mutex_acquire(&blm_ctx->reject_ap_list_lock); + status = qdf_mutex_acquire(&dlm_ctx->reject_ap_list_lock); if (QDF_IS_STATUS_ERROR(status)) { - blm_err("failed to acquire reject_ap_list_lock"); + dlm_err("failed to acquire reject_ap_list_lock"); return status; } - cfg = &blm_psoc_obj->blm_cfg; + cfg = &dlm_psoc_obj->dlm_cfg; - qdf_list_peek_front(&blm_ctx->reject_ap_list, &cur_node); + qdf_list_peek_front(&dlm_ctx->reject_ap_list, &cur_node); while (cur_node) { - qdf_list_peek_next(&blm_ctx->reject_ap_list, + qdf_list_peek_next(&dlm_ctx->reject_ap_list, cur_node, &next_node); - blm_entry = qdf_container_of(cur_node, struct blm_reject_ap, - node); + dlm_entry = qdf_container_of(cur_node, struct dlm_reject_ap, + node); /* Update the AP info to the latest list first */ - blm_update_ap_info(blm_entry, cfg, NULL); - if (!blm_entry->reject_ap_type) { - blm_debug(QDF_MAC_ADDR_FMT" cleared from list", - QDF_MAC_ADDR_REF(blm_entry->bssid.bytes)); - qdf_list_remove_node(&blm_ctx->reject_ap_list, - &blm_entry->node); - qdf_mem_free(blm_entry); + dlm_update_ap_info(dlm_entry, cfg, NULL); + if (!dlm_entry->reject_ap_type) { + dlm_debug(QDF_MAC_ADDR_FMT " cleared from list", + QDF_MAC_ADDR_REF(dlm_entry->bssid.bytes)); + qdf_list_remove_node(&dlm_ctx->reject_ap_list, + &dlm_entry->node); + qdf_mem_free(dlm_entry); cur_node = next_node; next_node = NULL; continue; } - if (qdf_is_macaddr_equal(&blm_entry->bssid, &ap_info->bssid)) { - blm_modify_entry(blm_entry, cfg, ap_info); + if (qdf_is_macaddr_equal(&dlm_entry->bssid, &ap_info->bssid)) { + dlm_modify_entry(dlm_entry, cfg, ap_info); goto end; } @@ -1084,129 +1090,130 @@ blm_add_bssid_to_reject_list(struct wlan_objmgr_pdev *pdev, next_node = NULL; } - if (qdf_list_size(&blm_ctx->reject_ap_list) == MAX_BAD_AP_LIST_SIZE) { + if (qdf_list_size(&dlm_ctx->reject_ap_list) == MAX_BAD_AP_LIST_SIZE) { /* List is FULL, need to delete entries */ status = - blm_remove_lowest_delta_entry(&blm_ctx->reject_ap_list, + dlm_remove_lowest_delta_entry(&dlm_ctx->reject_ap_list, cfg); if (QDF_IS_STATUS_ERROR(status)) { - qdf_mutex_release(&blm_ctx->reject_ap_list_lock); + qdf_mutex_release(&dlm_ctx->reject_ap_list_lock); return status; } } - blm_entry = qdf_mem_malloc(sizeof(*blm_entry)); - if (!blm_entry) { - qdf_mutex_release(&blm_ctx->reject_ap_list_lock); + dlm_entry = qdf_mem_malloc(sizeof(*dlm_entry)); + if (!dlm_entry) { + qdf_mutex_release(&dlm_ctx->reject_ap_list_lock); return QDF_STATUS_E_FAILURE; } - qdf_list_insert_back(&blm_ctx->reject_ap_list, &blm_entry->node); - blm_modify_entry(blm_entry, cfg, ap_info); + qdf_list_insert_back(&dlm_ctx->reject_ap_list, &dlm_entry->node); + dlm_modify_entry(dlm_entry, cfg, ap_info); end: - blm_send_reject_ap_list_to_fw(pdev, &blm_ctx->reject_ap_list, cfg); - qdf_mutex_release(&blm_ctx->reject_ap_list_lock); + dlm_send_reject_ap_list_to_fw(pdev, &dlm_ctx->reject_ap_list, cfg); + qdf_mutex_release(&dlm_ctx->reject_ap_list_lock); return QDF_STATUS_SUCCESS; } static QDF_STATUS -blm_clear_userspace_blacklist_info(struct wlan_objmgr_pdev *pdev) +dlm_clear_userspace_denylist_info(struct wlan_objmgr_pdev *pdev) { - struct blm_pdev_priv_obj *blm_ctx; - struct blm_reject_ap *blm_entry; + struct dlm_pdev_priv_obj *dlm_ctx; + struct dlm_reject_ap *dlm_entry; QDF_STATUS status; qdf_list_node_t *cur_node = NULL, *next_node = NULL; - blm_ctx = blm_get_pdev_obj(pdev); - if (!blm_ctx) { - blm_err("blm_ctx is NULL"); + dlm_ctx = dlm_get_pdev_obj(pdev); + if (!dlm_ctx) { + dlm_err("dlm_ctx is NULL"); return QDF_STATUS_E_INVAL; } - status = qdf_mutex_acquire(&blm_ctx->reject_ap_list_lock); + status = qdf_mutex_acquire(&dlm_ctx->reject_ap_list_lock); if (QDF_IS_STATUS_ERROR(status)) { - blm_err("failed to acquire reject_ap_list_lock"); + dlm_err("failed to acquire reject_ap_list_lock"); return QDF_STATUS_E_RESOURCES; } - qdf_list_peek_front(&blm_ctx->reject_ap_list, &cur_node); + qdf_list_peek_front(&dlm_ctx->reject_ap_list, &cur_node); while (cur_node) { - qdf_list_peek_next(&blm_ctx->reject_ap_list, cur_node, + qdf_list_peek_next(&dlm_ctx->reject_ap_list, cur_node, &next_node); - blm_entry = qdf_container_of(cur_node, struct blm_reject_ap, - node); + dlm_entry = qdf_container_of(cur_node, struct dlm_reject_ap, + node); - if (IS_AP_IN_USERSPACE_BLACKLIST_ONLY(blm_entry)) { - blm_debug("removing bssid: "QDF_MAC_ADDR_FMT, - QDF_MAC_ADDR_REF(blm_entry->bssid.bytes)); - qdf_list_remove_node(&blm_ctx->reject_ap_list, - &blm_entry->node); - qdf_mem_free(blm_entry); - } else if (BLM_IS_AP_BLACKLISTED_BY_USERSPACE(blm_entry)) { - blm_debug("Clearing userspace blacklist bit for "QDF_MAC_ADDR_FMT, - QDF_MAC_ADDR_REF(blm_entry->bssid.bytes)); - blm_entry->userspace_blacklist = false; - blm_entry->blacklist_userspace = false; + if (IS_AP_IN_USERSPACE_DENYLIST_ONLY(dlm_entry)) { + dlm_debug("removing bssid: " QDF_MAC_ADDR_FMT, + QDF_MAC_ADDR_REF(dlm_entry->bssid.bytes)); + qdf_list_remove_node(&dlm_ctx->reject_ap_list, + &dlm_entry->node); + qdf_mem_free(dlm_entry); + } else if (DLM_IS_AP_DENYLISTED_BY_USERSPACE(dlm_entry)) { + dlm_debug("Clearing userspace denylist bit for " + QDF_MAC_ADDR_FMT, + QDF_MAC_ADDR_REF(dlm_entry->bssid.bytes)); + dlm_entry->userspace_denylist = false; + dlm_entry->denylist_userspace = false; } cur_node = next_node; next_node = NULL; } - qdf_mutex_release(&blm_ctx->reject_ap_list_lock); + qdf_mutex_release(&dlm_ctx->reject_ap_list_lock); return QDF_STATUS_SUCCESS; } QDF_STATUS -blm_add_userspace_black_list(struct wlan_objmgr_pdev *pdev, - struct qdf_mac_addr *bssid_black_list, - uint8_t num_of_bssid) +dlm_add_userspace_deny_list(struct wlan_objmgr_pdev *pdev, + struct qdf_mac_addr *bssid_deny_list, + uint8_t num_of_bssid) { uint8_t i = 0; struct reject_ap_info ap_info; QDF_STATUS status; - struct blm_pdev_priv_obj *blm_ctx; - struct blm_psoc_priv_obj *blm_psoc_obj; - struct blm_config *cfg; + struct dlm_pdev_priv_obj *dlm_ctx; + struct dlm_psoc_priv_obj *dlm_psoc_obj; + struct dlm_config *cfg; - blm_ctx = blm_get_pdev_obj(pdev); - blm_psoc_obj = blm_get_psoc_obj(wlan_pdev_get_psoc(pdev)); + dlm_ctx = dlm_get_pdev_obj(pdev); + dlm_psoc_obj = dlm_get_psoc_obj(wlan_pdev_get_psoc(pdev)); - if (!blm_ctx || !blm_psoc_obj) { - blm_err("blm_ctx or blm_psoc_obj is NULL"); + if (!dlm_ctx || !dlm_psoc_obj) { + dlm_err("dlm_ctx or dlm_psoc_obj is NULL"); return QDF_STATUS_E_INVAL; } - /* Clear all the info of APs already existing in BLM first */ - blm_clear_userspace_blacklist_info(pdev); - cfg = &blm_psoc_obj->blm_cfg; + /* Clear all the info of APs already existing in DLM first */ + dlm_clear_userspace_denylist_info(pdev); + cfg = &dlm_psoc_obj->dlm_cfg; - status = qdf_mutex_acquire(&blm_ctx->reject_ap_list_lock); + status = qdf_mutex_acquire(&dlm_ctx->reject_ap_list_lock); if (QDF_IS_STATUS_ERROR(status)) { - blm_err("failed to acquire reject_ap_list_lock"); + dlm_err("failed to acquire reject_ap_list_lock"); return status; } - blm_send_reject_ap_list_to_fw(pdev, &blm_ctx->reject_ap_list, cfg); - qdf_mutex_release(&blm_ctx->reject_ap_list_lock); + dlm_send_reject_ap_list_to_fw(pdev, &dlm_ctx->reject_ap_list, cfg); + qdf_mutex_release(&dlm_ctx->reject_ap_list_lock); - if (!bssid_black_list || !num_of_bssid) { - blm_debug("Userspace blacklist/num of blacklist NULL"); + if (!bssid_deny_list || !num_of_bssid) { + dlm_debug("Userspace denylist/num of denylist NULL"); return QDF_STATUS_SUCCESS; } for (i = 0; i < num_of_bssid; i++) { qdf_mem_zero(&ap_info, sizeof(struct reject_ap_info)); - ap_info.bssid = bssid_black_list[i]; - ap_info.reject_ap_type = USERSPACE_BLACKLIST_TYPE; + ap_info.bssid = bssid_deny_list[i]; + ap_info.reject_ap_type = USERSPACE_DENYLIST_TYPE; ap_info.source = ADDED_BY_DRIVER; ap_info.reject_reason = REASON_USERSPACE_BL; - status = blm_add_bssid_to_reject_list(pdev, &ap_info); + status = dlm_add_bssid_to_reject_list(pdev, &ap_info); if (QDF_IS_STATUS_ERROR(status)) { - blm_err("Failed to add bssid to userspace blacklist"); + dlm_err("Failed to add bssid to userspace denylist"); return QDF_STATUS_E_FAILURE; } } @@ -1215,110 +1222,111 @@ blm_add_userspace_black_list(struct wlan_objmgr_pdev *pdev, } void -blm_flush_reject_ap_list(struct blm_pdev_priv_obj *blm_ctx) +dlm_flush_reject_ap_list(struct dlm_pdev_priv_obj *dlm_ctx) { - struct blm_reject_ap *blm_entry = NULL; + struct dlm_reject_ap *dlm_entry = NULL; QDF_STATUS status; qdf_list_node_t *cur_node = NULL, *next_node = NULL; - status = qdf_mutex_acquire(&blm_ctx->reject_ap_list_lock); + status = qdf_mutex_acquire(&dlm_ctx->reject_ap_list_lock); if (QDF_IS_STATUS_ERROR(status)) { - blm_err("failed to acquire reject_ap_list_lock"); + dlm_err("failed to acquire reject_ap_list_lock"); return; } - qdf_list_peek_front(&blm_ctx->reject_ap_list, &cur_node); + qdf_list_peek_front(&dlm_ctx->reject_ap_list, &cur_node); while (cur_node) { - qdf_list_peek_next(&blm_ctx->reject_ap_list, cur_node, + qdf_list_peek_next(&dlm_ctx->reject_ap_list, cur_node, &next_node); - blm_entry = qdf_container_of(cur_node, struct blm_reject_ap, - node); - qdf_list_remove_node(&blm_ctx->reject_ap_list, - &blm_entry->node); - qdf_mem_free(blm_entry); + dlm_entry = qdf_container_of(cur_node, struct dlm_reject_ap, + node); + qdf_list_remove_node(&dlm_ctx->reject_ap_list, + &dlm_entry->node); + qdf_mem_free(dlm_entry); cur_node = next_node; next_node = NULL; } - blm_debug("BLM reject ap list flushed"); - qdf_mutex_release(&blm_ctx->reject_ap_list_lock); + dlm_debug("DLM reject ap list flushed"); + qdf_mutex_release(&dlm_ctx->reject_ap_list_lock); } uint8_t -blm_get_bssid_reject_list(struct wlan_objmgr_pdev *pdev, +dlm_get_bssid_reject_list(struct wlan_objmgr_pdev *pdev, struct reject_ap_config_params *reject_list, uint8_t max_bssid_to_be_filled, - enum blm_reject_ap_type reject_ap_type) + enum dlm_reject_ap_type reject_ap_type) { - struct blm_pdev_priv_obj *blm_ctx; - struct blm_psoc_priv_obj *blm_psoc_obj; + struct dlm_pdev_priv_obj *dlm_ctx; + struct dlm_psoc_priv_obj *dlm_psoc_obj; uint8_t num_of_reject_bssid = 0; QDF_STATUS status; - blm_ctx = blm_get_pdev_obj(pdev); - blm_psoc_obj = blm_get_psoc_obj(wlan_pdev_get_psoc(pdev)); + dlm_ctx = dlm_get_pdev_obj(pdev); + dlm_psoc_obj = dlm_get_psoc_obj(wlan_pdev_get_psoc(pdev)); - if (!blm_ctx || !blm_psoc_obj) { - blm_err("blm_ctx or blm_psoc_obj is NULL"); + if (!dlm_ctx || !dlm_psoc_obj) { + dlm_err("dlm_ctx or dlm_psoc_obj is NULL"); return 0; } - status = qdf_mutex_acquire(&blm_ctx->reject_ap_list_lock); + status = qdf_mutex_acquire(&dlm_ctx->reject_ap_list_lock); if (QDF_IS_STATUS_ERROR(status)) { - blm_err("failed to acquire reject_ap_list_lock"); + dlm_err("failed to acquire reject_ap_list_lock"); return 0; } - blm_fill_reject_list(&blm_ctx->reject_ap_list, reject_list, + dlm_fill_reject_list(&dlm_ctx->reject_ap_list, reject_list, &num_of_reject_bssid, reject_ap_type, - max_bssid_to_be_filled, &blm_psoc_obj->blm_cfg); + max_bssid_to_be_filled, &dlm_psoc_obj->dlm_cfg); - qdf_mutex_release(&blm_ctx->reject_ap_list_lock); + qdf_mutex_release(&dlm_ctx->reject_ap_list_lock); return num_of_reject_bssid; } void -blm_update_bssid_connect_params(struct wlan_objmgr_pdev *pdev, +dlm_update_bssid_connect_params(struct wlan_objmgr_pdev *pdev, struct qdf_mac_addr bssid, - enum blm_connection_state con_state) + enum dlm_connection_state con_state) { - struct blm_pdev_priv_obj *blm_ctx; - struct blm_psoc_priv_obj *blm_psoc_obj; + struct dlm_pdev_priv_obj *dlm_ctx; + struct dlm_psoc_priv_obj *dlm_psoc_obj; qdf_list_node_t *cur_node = NULL, *next_node = NULL; QDF_STATUS status; - struct blm_reject_ap *blm_entry = NULL; + struct dlm_reject_ap *dlm_entry = NULL; qdf_time_t connection_age = 0; bool entry_found = false; qdf_time_t max_entry_time; + qdf_time_t bad_bssid_reset_time; - blm_ctx = blm_get_pdev_obj(pdev); - blm_psoc_obj = blm_get_psoc_obj(wlan_pdev_get_psoc(pdev)); + dlm_ctx = dlm_get_pdev_obj(pdev); + dlm_psoc_obj = dlm_get_psoc_obj(wlan_pdev_get_psoc(pdev)); - if (!blm_ctx || !blm_psoc_obj) { - blm_err("blm_ctx or blm_psoc_obj is NULL"); + if (!dlm_ctx || !dlm_psoc_obj) { + dlm_err("dlm_ctx or dlm_psoc_obj is NULL"); return; } - status = qdf_mutex_acquire(&blm_ctx->reject_ap_list_lock); + status = qdf_mutex_acquire(&dlm_ctx->reject_ap_list_lock); if (QDF_IS_STATUS_ERROR(status)) { - blm_err("failed to acquire reject_ap_list_lock"); + dlm_err("failed to acquire reject_ap_list_lock"); return; } - qdf_list_peek_front(&blm_ctx->reject_ap_list, &cur_node); + qdf_list_peek_front(&dlm_ctx->reject_ap_list, &cur_node); while (cur_node) { - qdf_list_peek_next(&blm_ctx->reject_ap_list, cur_node, + qdf_list_peek_next(&dlm_ctx->reject_ap_list, cur_node, &next_node); - blm_entry = qdf_container_of(cur_node, struct blm_reject_ap, + dlm_entry = qdf_container_of(cur_node, struct dlm_reject_ap, node); - if (!qdf_mem_cmp(blm_entry->bssid.bytes, bssid.bytes, + if (!qdf_mem_cmp(dlm_entry->bssid.bytes, bssid.bytes, QDF_MAC_ADDR_SIZE)) { - blm_debug(QDF_MAC_ADDR_FMT" present in BLM reject list, updating connect info con_state = %d", - QDF_MAC_ADDR_REF(blm_entry->bssid.bytes), + dlm_debug(QDF_MAC_ADDR_FMT " present in DLM reject list, updating connect info con_state = %d", + QDF_MAC_ADDR_REF(dlm_entry->bssid.bytes), con_state); entry_found = true; break; @@ -1327,73 +1335,73 @@ blm_update_bssid_connect_params(struct wlan_objmgr_pdev *pdev, next_node = NULL; } - /* This means that the BSSID was not added in the reject list of BLM */ + /* This means that the BSSID was not added in the reject list of DLM */ if (!entry_found) { - qdf_mutex_release(&blm_ctx->reject_ap_list_lock); + qdf_mutex_release(&dlm_ctx->reject_ap_list_lock); return; } switch (con_state) { - case BLM_AP_CONNECTED: - blm_entry->connect_timestamp = qdf_mc_timer_get_system_time(); + case DLM_AP_CONNECTED: + dlm_entry->connect_timestamp = qdf_mc_timer_get_system_time(); break; - case BLM_AP_DISCONNECTED: - /* Update the blm info first */ - blm_update_ap_info(blm_entry, &blm_psoc_obj->blm_cfg, NULL); + case DLM_AP_DISCONNECTED: + /* Update the dlm info first */ + dlm_update_ap_info(dlm_entry, &dlm_psoc_obj->dlm_cfg, NULL); - max_entry_time = blm_entry->connect_timestamp; - if (blm_entry->driver_blacklist) { + max_entry_time = dlm_entry->connect_timestamp; + if (dlm_entry->driver_denylist) { max_entry_time = - blm_entry->ap_timestamp.driver_blacklist_timestamp; - } else if (blm_entry->driver_avoidlist) { + dlm_entry->ap_timestamp.driver_denylist_timestamp; + } else if (dlm_entry->driver_avoidlist) { max_entry_time = - QDF_MAX(blm_entry->ap_timestamp.driver_avoid_timestamp, - blm_entry->connect_timestamp); + QDF_MAX(dlm_entry->ap_timestamp.driver_avoid_timestamp, + dlm_entry->connect_timestamp); } connection_age = qdf_mc_timer_get_system_time() - max_entry_time; - if ((connection_age > - SECONDS_TO_MS(blm_psoc_obj->blm_cfg. - bad_bssid_counter_reset_time))) { - blm_entry->driver_avoidlist = false; - blm_entry->driver_blacklist = false; - blm_entry->driver_monitorlist = false; - blm_entry->userspace_avoidlist = false; - blm_debug("updated reject ap type %d ", - blm_entry->reject_ap_type); - if (!blm_entry->reject_ap_type) { - blm_debug("Bad Bssid timer expired/AP cleared from all blacklisting, removed "QDF_MAC_ADDR_FMT" from list", - QDF_MAC_ADDR_REF(blm_entry->bssid.bytes)); - qdf_list_remove_node(&blm_ctx->reject_ap_list, - &blm_entry->node); - qdf_mem_free(blm_entry); - blm_send_reject_ap_list_to_fw(pdev, - &blm_ctx->reject_ap_list, - &blm_psoc_obj->blm_cfg); + bad_bssid_reset_time = + dlm_psoc_obj->dlm_cfg.bad_bssid_counter_reset_time; + if (connection_age > SECONDS_TO_MS(bad_bssid_reset_time)) { + dlm_entry->driver_avoidlist = false; + dlm_entry->driver_denylist = false; + dlm_entry->driver_monitorlist = false; + dlm_entry->userspace_avoidlist = false; + dlm_debug("updated reject ap type %d ", + dlm_entry->reject_ap_type); + if (!dlm_entry->reject_ap_type) { + dlm_debug("Bad Bssid timer expired/AP cleared from all denylisting, removed " QDF_MAC_ADDR_FMT " from list", + QDF_MAC_ADDR_REF(dlm_entry->bssid.bytes)); + qdf_list_remove_node(&dlm_ctx->reject_ap_list, + &dlm_entry->node); + qdf_mem_free(dlm_entry); + dlm_send_reject_ap_list_to_fw(pdev, + &dlm_ctx->reject_ap_list, + &dlm_psoc_obj->dlm_cfg); } } break; default: - blm_debug("Invalid AP connection state recevied %d", con_state); + dlm_debug("Invalid AP connection state received %d", con_state); }; - qdf_mutex_release(&blm_ctx->reject_ap_list_lock); + qdf_mutex_release(&dlm_ctx->reject_ap_list_lock); } -int32_t blm_get_rssi_blacklist_threshold(struct wlan_objmgr_pdev *pdev) +int32_t dlm_get_rssi_denylist_threshold(struct wlan_objmgr_pdev *pdev) { - struct blm_pdev_priv_obj *blm_ctx; - struct blm_psoc_priv_obj *blm_psoc_obj; - struct blm_config *cfg; + struct dlm_pdev_priv_obj *dlm_ctx; + struct dlm_psoc_priv_obj *dlm_psoc_obj; + struct dlm_config *cfg; - blm_ctx = blm_get_pdev_obj(pdev); - blm_psoc_obj = blm_get_psoc_obj(wlan_pdev_get_psoc(pdev)); + dlm_ctx = dlm_get_pdev_obj(pdev); + dlm_psoc_obj = dlm_get_psoc_obj(wlan_pdev_get_psoc(pdev)); - if (!blm_ctx || !blm_psoc_obj) { - blm_err("blm_ctx or blm_psoc_obj is NULL"); + if (!dlm_ctx || !dlm_psoc_obj) { + dlm_err("dlm_ctx or dlm_psoc_obj is NULL"); return 0; } - cfg = &blm_psoc_obj->blm_cfg; + cfg = &dlm_psoc_obj->dlm_cfg; return cfg->delta_rssi; } diff --git a/components/blacklist_mgr/core/src/wlan_blm_main.c b/components/blacklist_mgr/core/src/wlan_blm_main.c index f965683c29..88179ada36 100644 --- a/components/blacklist_mgr/core/src/wlan_blm_main.c +++ b/components/blacklist_mgr/core/src/wlan_blm_main.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. 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 @@ -17,9 +18,9 @@ */ /** - * DOC: wlan_blm_main.c + * DOC: wlan_dlm_main.c * - * WLAN Blacklist Mgr related APIs + * WLAN Denylist Mgr related APIs * */ @@ -30,160 +31,160 @@ #include "cfg_ucfg_api.h" #include -struct blm_pdev_priv_obj * -blm_get_pdev_obj(struct wlan_objmgr_pdev *pdev) +struct dlm_pdev_priv_obj * +dlm_get_pdev_obj(struct wlan_objmgr_pdev *pdev) { - struct blm_pdev_priv_obj *blm_pdev_obj; + struct dlm_pdev_priv_obj *dlm_pdev_obj; - blm_pdev_obj = wlan_objmgr_pdev_get_comp_private_obj(pdev, - WLAN_UMAC_COMP_BLACKLIST_MGR); + dlm_pdev_obj = wlan_objmgr_pdev_get_comp_private_obj(pdev, + WLAN_UMAC_COMP_DENYLIST_MGR); - return blm_pdev_obj; + return dlm_pdev_obj; } -struct blm_psoc_priv_obj * -blm_get_psoc_obj(struct wlan_objmgr_psoc *psoc) +struct dlm_psoc_priv_obj * +dlm_get_psoc_obj(struct wlan_objmgr_psoc *psoc) { - struct blm_psoc_priv_obj *blm_psoc_obj; + struct dlm_psoc_priv_obj *dlm_psoc_obj; - blm_psoc_obj = wlan_objmgr_psoc_get_comp_private_obj(psoc, - WLAN_UMAC_COMP_BLACKLIST_MGR); + dlm_psoc_obj = wlan_objmgr_psoc_get_comp_private_obj(psoc, + WLAN_UMAC_COMP_DENYLIST_MGR); - return blm_psoc_obj; + return dlm_psoc_obj; } QDF_STATUS -blm_pdev_object_created_notification(struct wlan_objmgr_pdev *pdev, +dlm_pdev_object_created_notification(struct wlan_objmgr_pdev *pdev, void *arg) { - struct blm_pdev_priv_obj *blm_ctx; + struct dlm_pdev_priv_obj *dlm_ctx; QDF_STATUS status; - blm_ctx = qdf_mem_malloc(sizeof(*blm_ctx)); + dlm_ctx = qdf_mem_malloc(sizeof(*dlm_ctx)); - if (!blm_ctx) + if (!dlm_ctx) return QDF_STATUS_E_FAILURE; - status = qdf_mutex_create(&blm_ctx->reject_ap_list_lock); + status = qdf_mutex_create(&dlm_ctx->reject_ap_list_lock); if (QDF_IS_STATUS_ERROR(status)) { - blm_err("Failed to create mutex"); - qdf_mem_free(blm_ctx); + dlm_err("Failed to create mutex"); + qdf_mem_free(dlm_ctx); return status; } - qdf_list_create(&blm_ctx->reject_ap_list, MAX_BAD_AP_LIST_SIZE); + qdf_list_create(&dlm_ctx->reject_ap_list, MAX_BAD_AP_LIST_SIZE); - target_if_blm_register_tx_ops(&blm_ctx->blm_tx_ops); + target_if_dlm_register_tx_ops(&dlm_ctx->dlm_tx_ops); status = wlan_objmgr_pdev_component_obj_attach(pdev, - WLAN_UMAC_COMP_BLACKLIST_MGR, - blm_ctx, + WLAN_UMAC_COMP_DENYLIST_MGR, + dlm_ctx, QDF_STATUS_SUCCESS); if (QDF_IS_STATUS_ERROR(status)) { - blm_err("Failed to attach pdev_ctx with pdev"); - qdf_list_destroy(&blm_ctx->reject_ap_list); - qdf_mutex_destroy(&blm_ctx->reject_ap_list_lock); - qdf_mem_free(blm_ctx); + dlm_err("Failed to attach pdev_ctx with pdev"); + qdf_list_destroy(&dlm_ctx->reject_ap_list); + qdf_mutex_destroy(&dlm_ctx->reject_ap_list_lock); + qdf_mem_free(dlm_ctx); } return status; } QDF_STATUS -blm_pdev_object_destroyed_notification(struct wlan_objmgr_pdev *pdev, +dlm_pdev_object_destroyed_notification(struct wlan_objmgr_pdev *pdev, void *arg) { - struct blm_pdev_priv_obj *blm_ctx; + struct dlm_pdev_priv_obj *dlm_ctx; - blm_ctx = blm_get_pdev_obj(pdev); + dlm_ctx = dlm_get_pdev_obj(pdev); - if (!blm_ctx) { - blm_err("BLM Pdev obj is NULL"); + if (!dlm_ctx) { + dlm_err("DLM Pdev obj is NULL"); return QDF_STATUS_E_FAILURE; } /* Clear away the memory allocated for the bad BSSIDs */ - blm_flush_reject_ap_list(blm_ctx); - qdf_list_destroy(&blm_ctx->reject_ap_list); - qdf_mutex_destroy(&blm_ctx->reject_ap_list_lock); + dlm_flush_reject_ap_list(dlm_ctx); + qdf_list_destroy(&dlm_ctx->reject_ap_list); + qdf_mutex_destroy(&dlm_ctx->reject_ap_list_lock); wlan_objmgr_pdev_component_obj_detach(pdev, - WLAN_UMAC_COMP_BLACKLIST_MGR, - blm_ctx); - qdf_mem_free(blm_ctx); + WLAN_UMAC_COMP_DENYLIST_MGR, + dlm_ctx); + qdf_mem_free(dlm_ctx); return QDF_STATUS_SUCCESS; } QDF_STATUS -blm_psoc_object_created_notification(struct wlan_objmgr_psoc *psoc, +dlm_psoc_object_created_notification(struct wlan_objmgr_psoc *psoc, void *arg) { - struct blm_psoc_priv_obj *blm_psoc_obj; + struct dlm_psoc_priv_obj *dlm_psoc_obj; QDF_STATUS status; - blm_psoc_obj = qdf_mem_malloc(sizeof(*blm_psoc_obj)); + dlm_psoc_obj = qdf_mem_malloc(sizeof(*dlm_psoc_obj)); - if (!blm_psoc_obj) + if (!dlm_psoc_obj) return QDF_STATUS_E_FAILURE; status = wlan_objmgr_psoc_component_obj_attach(psoc, - WLAN_UMAC_COMP_BLACKLIST_MGR, - blm_psoc_obj, + WLAN_UMAC_COMP_DENYLIST_MGR, + dlm_psoc_obj, QDF_STATUS_SUCCESS); if (QDF_IS_STATUS_ERROR(status)) { - blm_err("Failed to attach psoc_ctx with psoc"); - qdf_mem_free(blm_psoc_obj); + dlm_err("Failed to attach psoc_ctx with psoc"); + qdf_mem_free(dlm_psoc_obj); } return status; } QDF_STATUS -blm_psoc_object_destroyed_notification(struct wlan_objmgr_psoc *psoc, void *arg) +dlm_psoc_object_destroyed_notification(struct wlan_objmgr_psoc *psoc, void *arg) { - struct blm_psoc_priv_obj *blm_psoc_obj; + struct dlm_psoc_priv_obj *dlm_psoc_obj; - blm_psoc_obj = blm_get_psoc_obj(psoc); + dlm_psoc_obj = dlm_get_psoc_obj(psoc); - if (!blm_psoc_obj) { - blm_err("BLM psoc obj NULL"); + if (!dlm_psoc_obj) { + dlm_err("DLM psoc obj NULL"); return QDF_STATUS_E_FAILURE; } wlan_objmgr_psoc_component_obj_detach(psoc, - WLAN_UMAC_COMP_BLACKLIST_MGR, - blm_psoc_obj); - qdf_mem_free(blm_psoc_obj); + WLAN_UMAC_COMP_DENYLIST_MGR, + dlm_psoc_obj); + qdf_mem_free(dlm_psoc_obj); return QDF_STATUS_SUCCESS; } static void -blm_init_cfg(struct wlan_objmgr_psoc *psoc, struct blm_config *blm_cfg) +dlm_init_cfg(struct wlan_objmgr_psoc *psoc, struct dlm_config *dlm_cfg) { - blm_cfg->avoid_list_exipry_time = + dlm_cfg->avoid_list_exipry_time = cfg_get(psoc, CFG_AVOID_LIST_EXPIRY_TIME); - blm_cfg->black_list_exipry_time = - cfg_get(psoc, CFG_BLACK_LIST_EXPIRY_TIME); - blm_cfg->bad_bssid_counter_reset_time = + dlm_cfg->deny_list_exipry_time = + cfg_get(psoc, CFG_DENY_LIST_EXPIRY_TIME); + dlm_cfg->bad_bssid_counter_reset_time = cfg_get(psoc, CFG_BAD_BSSID_RESET_TIME); - blm_cfg->bad_bssid_counter_thresh = + dlm_cfg->bad_bssid_counter_thresh = cfg_get(psoc, CFG_BAD_BSSID_COUNTER_THRESHOLD); - blm_cfg->delta_rssi = - cfg_get(psoc, CFG_BLACKLIST_RSSI_THRESHOLD); + dlm_cfg->delta_rssi = + cfg_get(psoc, CFG_DENYLIST_RSSI_THRESHOLD); } QDF_STATUS -blm_cfg_psoc_open(struct wlan_objmgr_psoc *psoc) +dlm_cfg_psoc_open(struct wlan_objmgr_psoc *psoc) { - struct blm_psoc_priv_obj *blm_psoc_obj; + struct dlm_psoc_priv_obj *dlm_psoc_obj; - blm_psoc_obj = blm_get_psoc_obj(psoc); + dlm_psoc_obj = dlm_get_psoc_obj(psoc); - if (!blm_psoc_obj) { - blm_err("BLM psoc obj NULL"); + if (!dlm_psoc_obj) { + dlm_err("DLM psoc obj NULL"); return QDF_STATUS_E_FAILURE; } - blm_init_cfg(psoc, &blm_psoc_obj->blm_cfg); + dlm_init_cfg(psoc, &dlm_psoc_obj->dlm_cfg); return QDF_STATUS_SUCCESS; } diff --git a/components/blacklist_mgr/dispatcher/inc/wlan_blm_api.h b/components/blacklist_mgr/dispatcher/inc/wlan_blm_api.h index 73928173fd..9296bb6067 100644 --- a/components/blacklist_mgr/dispatcher/inc/wlan_blm_api.h +++ b/components/blacklist_mgr/dispatcher/inc/wlan_blm_api.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. 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 @@ -16,134 +17,134 @@ * PERFORMANCE OF THIS SOFTWARE. */ /** - * DOC: declare public APIs exposed by the blacklist manager component + * DOC: declare public APIs exposed by the denylist manager component */ -#ifndef _WLAN_BLM_API_H_ -#define _WLAN_BLM_API_H_ +#ifndef _WLAN_DLM_API_H_ +#define _WLAN_DLM_API_H_ #include "qdf_types.h" #include "wlan_objmgr_pdev_obj.h" #include -#ifdef FEATURE_BLACKLIST_MGR +#ifdef FEATURE_DENYLIST_MGR #include "wlan_blm_core.h" /** - * wlan_blm_add_bssid_to_reject_list() - Add BSSID to the specific reject list. + * wlan_dlm_add_bssid_to_reject_list() - Add BSSID to the specific reject list. * @pdev: Pdev object * @ap_info: Ap info params such as BSSID, and the type of rejection to be done * - * This API will add the BSSID to the reject AP list maintained by the blacklist + * This API will add the BSSID to the reject AP list maintained by the denylist * manager. */ static inline QDF_STATUS -wlan_blm_add_bssid_to_reject_list(struct wlan_objmgr_pdev *pdev, +wlan_dlm_add_bssid_to_reject_list(struct wlan_objmgr_pdev *pdev, struct reject_ap_info *ap_info) { - return blm_add_bssid_to_reject_list(pdev, ap_info); + return dlm_add_bssid_to_reject_list(pdev, ap_info); } /** - * wlan_blm_update_bssid_connect_params() - Inform the BLM about connect or + * wlan_dlm_update_bssid_connect_params() - Inform the DLM about connect or * disconnect with the current AP. * @pdev: pdev object * @bssid: BSSID of the AP * @con_state: Connection stae (connected/disconnected) * - * This API will inform the BLM about the state with the AP so that if the AP + * This API will inform the DLM about the state with the AP so that if the AP * is selected, and the connection went through, and the connection did not - * face any data stall till the bad bssid reset timer, BLM can remove the + * face any data stall till the bad bssid reset timer, DLM can remove the * AP from the reject ap list maintained by it. * * Return: None */ static inline void -wlan_blm_update_bssid_connect_params(struct wlan_objmgr_pdev *pdev, +wlan_dlm_update_bssid_connect_params(struct wlan_objmgr_pdev *pdev, struct qdf_mac_addr bssid, - enum blm_connection_state con_state) + enum dlm_connection_state con_state) { - return blm_update_bssid_connect_params(pdev, bssid, con_state); + return dlm_update_bssid_connect_params(pdev, bssid, con_state); } /** - * wlan_blm_get_bssid_reject_list() - Get the BSSIDs in reject list from BLM + * wlan_dlm_get_bssid_reject_list() - Get the BSSIDs in reject list from DLM * @pdev: pdev object * @reject_list: reject list to be filled (passed by caller) - * @max_bssid_to_be_filled: num of bssids filled in reject list by BLM + * @max_bssid_to_be_filled: num of bssids filled in reject list by DLM * @reject_ap_type: reject ap type of the BSSIDs to be filled. * - * This API is a wrapper to an API of blacklist manager which will fill the + * This API is a wrapper to an API of denylist manager which will fill the * reject ap list requested by caller of type given as argument reject_ap_type, * and will return the number of BSSIDs filled. * - * Return: Unsigned integer (number of BSSIDs filled by the blacklist manager) + * Return: Unsigned integer (number of BSSIDs filled by the denylist manager) */ static inline uint8_t -wlan_blm_get_bssid_reject_list(struct wlan_objmgr_pdev *pdev, +wlan_dlm_get_bssid_reject_list(struct wlan_objmgr_pdev *pdev, struct reject_ap_config_params *reject_list, uint8_t max_bssid_to_be_filled, - enum blm_reject_ap_type reject_ap_type) + enum dlm_reject_ap_type reject_ap_type) { - return blm_get_bssid_reject_list(pdev, reject_list, + return dlm_get_bssid_reject_list(pdev, reject_list, max_bssid_to_be_filled, reject_ap_type); } /** - * wlan_blm_dump_blcklist_bssid() - dump the blacklisted BSSIDs from BLM + * wlan_dlm_dump_blcklist_bssid() - dump the denylisted BSSIDs from DLM * @pdev: pdev object * * Return: None */ static inline void -wlan_blm_dump_blcklist_bssid(struct wlan_objmgr_pdev *pdev) +wlan_dlm_dump_blcklist_bssid(struct wlan_objmgr_pdev *pdev) { - return blm_dump_blacklist_bssid(pdev); + return dlm_dump_denylist_bssid(pdev); } /** - * wlan_blm_get_rssi_blacklist_threshold() - Get the RSSI blacklist threshold + * wlan_dlm_get_rssi_denylist_threshold() - Get the RSSI denylist threshold * @pdev: pdev object * - * This API will get the rssi blacklist threshold value configured via - * CFG_BLACKLIST_RSSI_THRESHOLD. + * This API will get the rssi denylist threshold value configured via + * CFG_DENYLIST_RSSI_THRESHOLD. * * Return: int32_t (threshold value) */ static inline int32_t -wlan_blm_get_rssi_blacklist_threshold(struct wlan_objmgr_pdev *pdev) +wlan_dlm_get_rssi_denylist_threshold(struct wlan_objmgr_pdev *pdev) { - return blm_get_rssi_blacklist_threshold(pdev); + return dlm_get_rssi_denylist_threshold(pdev); } #else static inline QDF_STATUS -wlan_blm_add_bssid_to_reject_list(struct wlan_objmgr_pdev *pdev, +wlan_dlm_add_bssid_to_reject_list(struct wlan_objmgr_pdev *pdev, struct reject_ap_info *ap_info) { return QDF_STATUS_SUCCESS; } static inline uint8_t -wlan_blm_get_bssid_reject_list(struct wlan_objmgr_pdev *pdev, +wlan_dlm_get_bssid_reject_list(struct wlan_objmgr_pdev *pdev, struct reject_ap_config_params *reject_list, uint8_t max_bssid_to_be_filled, - enum blm_reject_ap_type reject_ap_type) + enum dlm_reject_ap_type reject_ap_type) { return 0; } static inline void -wlan_blm_update_bssid_connect_params(struct wlan_objmgr_pdev *pdev, +wlan_dlm_update_bssid_connect_params(struct wlan_objmgr_pdev *pdev, struct qdf_mac_addr bssid, - enum blm_connection_state con_state) + enum dlm_connection_state con_state) { } static inline int32_t -wlan_blm_get_rssi_blacklist_threshold(struct wlan_objmgr_pdev *pdev) +wlan_dlm_get_rssi_denylist_threshold(struct wlan_objmgr_pdev *pdev) { return 0; } diff --git a/components/blacklist_mgr/dispatcher/inc/wlan_blm_public_struct.h b/components/blacklist_mgr/dispatcher/inc/wlan_blm_public_struct.h index ac99c650e0..ba528a653b 100644 --- a/components/blacklist_mgr/dispatcher/inc/wlan_blm_public_struct.h +++ b/components/blacklist_mgr/dispatcher/inc/wlan_blm_public_struct.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. 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 @@ -16,82 +17,87 @@ * PERFORMANCE OF THIS SOFTWARE. */ /** - * DOC: define public structures of blacklist mgr. + * DOC: define public structures of denylist mgr. */ -#ifndef _WLAN_BLM_PUBLIC_STRUCT_H -#define _WLAN_BLM_PUBLIC_STRUCT_H +#ifndef _WLAN_DLM_PUBLIC_STRUCT_H +#define _WLAN_DLM_PUBLIC_STRUCT_H #include #include "wlan_objmgr_pdev_obj.h" #define MAX_BAD_AP_LIST_SIZE 28 -#define MAX_RSSI_AVOID_BSSID_LIST 10 -#define PDEV_MAX_NUM_BSSID_DISALLOW_LIST 28 +#define MAX_RSSI_AVOID_BSSID_LIST 10 +#define PDEV_MAX_NUM_BSSID_DISALLOW_LIST 28 /** - * enum blm_reject_ap_reason - Rejection reason for adding BSSID to BLM + * enum dlm_reject_ap_reason - Rejection reason for adding BSSID to DLM * @ADDED_BY_DRIVER: Source adding this BSSID is driver * @ADDED_BY_TARGET: Source adding this BSSID is target */ -enum blm_reject_ap_source { +enum dlm_reject_ap_source { ADDED_BY_DRIVER = 1, ADDED_BY_TARGET, }; /** - * struct blm_rssi_disallow_params - structure to specify params for RSSI reject + * struct dlm_rssi_disallow_params - structure to specify params for RSSI + * reject * @retry_delay: Time before which the AP doesn't expect a connection. - * @expected_rssi: RSSI less than which only the STA should try association. - * @received_time: Time at which the AP was added to blacklist. - * @original_timeout: Original timeout which the AP sent while blacklisting. + * @expected_rssi: RSSI less than which only the STA should try association + * @received_time: Time at which the AP was added to denylist. + * @original_timeout: Original timeout which the AP sent while denylisting. * @source: Source of adding this BSSID to RSSI reject list */ -struct blm_rssi_disallow_params { +struct dlm_rssi_disallow_params { uint32_t retry_delay; int8_t expected_rssi; qdf_time_t received_time; uint32_t original_timeout; - enum blm_reject_ap_source source; + enum dlm_reject_ap_source source; }; /** - * enum blm_reject_ap_type - Rejection type of the AP + * enum dlm_reject_ap_type - Rejection type of the AP * @USERSPACE_AVOID_TYPE: userspace wants the AP to be avoided. - * @USERSPACE_BLACKLIST_TYPE: userspace wants the AP to be blacklisted. + * @USERSPACE_DENYLIST_TYPE: userspace wants the AP to be denylisted. * @DRIVER_AVOID_TYPE: driver wants the AP to be avoided. - * @DRIVER_BLACKLIST_TYPE: driver wants the AP to be blacklisted. - * @DRIVER_RSSI_REJECT_TYPE: driver wants the AP to be in driver rssi reject. + * @DRIVER_DENYLIST_TYPE: driver wants the AP to be denylisted. + * @DRIVER_RSSI_REJECT_TYPE: driver wants the AP to be in driver rssi + * reject. * @DRIVER_MONITOR_TYPE: driver wants the AP to be in monitor list. * @REJECT_REASON_UNKNOWN: Rejection reason unknown */ -enum blm_reject_ap_type { - USERSPACE_AVOID_TYPE = 0, - USERSPACE_BLACKLIST_TYPE = 1, - DRIVER_AVOID_TYPE = 2, - DRIVER_BLACKLIST_TYPE = 3, - DRIVER_RSSI_REJECT_TYPE = 4, - DRIVER_MONITOR_TYPE = 5, - REJECT_REASON_UNKNOWN = 6, +enum dlm_reject_ap_type { + USERSPACE_AVOID_TYPE = 0, + USERSPACE_DENYLIST_TYPE = 1, + DRIVER_AVOID_TYPE = 2, + DRIVER_DENYLIST_TYPE = 3, + DRIVER_RSSI_REJECT_TYPE = 4, + DRIVER_MONITOR_TYPE = 5, + REJECT_REASON_UNKNOWN = 6, }; /** - * enum blm_reject_ap_reason - Rejection reason for adding BSSID to BLM + * enum dlm_reject_ap_reason - Rejection reason for adding BSSID to DLM * @REASON_UNKNOWN: Unknown reason * @REASON_NUD_FAILURE: NUD failure happened with this BSSID * @REASON_STA_KICKOUT: STA kickout happened with this BSSID * @REASON_ROAM_HO_FAILURE: HO failure happenend with this BSSID - * @REASON_ASSOC_REJECT_POOR_RSSI: assoc rsp with reason 71 received from AP. + * @REASON_ASSOC_REJECT_POOR_RSSI: assoc rsp with reason 71 received from + * AP. * @REASON_ASSOC_REJECT_OCE: OCE assoc reject received from the AP. - * @REASON_USERSPACE_BL: Userspace wants to blacklist this AP. + * @REASON_USERSPACE_BL: Userspace wants to denylist this AP. * @REASON_USERSPACE_AVOID_LIST: Userspace wants to avoid this AP. - * @REASON_BTM_DISASSOC_IMMINENT: BTM IE received with disassoc imminent set. + * @REASON_BTM_DISASSOC_IMMINENT: BTM IE received with disassoc imminent + * set. * @REASON_BTM_BSS_TERMINATION: BTM IE received with BSS termination set. * @REASON_BTM_MBO_RETRY: BTM IE received from AP with MBO retry set. * @REASON_REASSOC_RSSI_REJECT: Re-Assoc resp received with reason code 34 - * @REASON_REASSOC_NO_MORE_STAS: Re-assoc reject received with reason code 17 + * @REASON_REASSOC_NO_MORE_STAS: Re-assoc reject received with reason code + * 17 */ -enum blm_reject_ap_reason { +enum dlm_reject_ap_reason { REASON_UNKNOWN = 0, REASON_NUD_FAILURE, REASON_STA_KICKOUT, @@ -108,13 +114,13 @@ enum blm_reject_ap_reason { }; /** - * enum blm_connection_state - State with AP (Connected, Disconnected) - * @BLM_AP_CONNECTED: Connected with the AP - * @BLM_AP_DISCONNECTED: Disconnected with the AP + * enum dlm_connection_state - State with AP (Connected, Disconnected) + * @DLM_AP_CONNECTED: Connected with the AP + * @DLM_AP_DISCONNECTED: Disconnected with the AP */ -enum blm_connection_state { - BLM_AP_CONNECTED, - BLM_AP_DISCONNECTED, +enum dlm_connection_state { + DLM_AP_CONNECTED, + DLM_AP_DISCONNECTED, }; /** @@ -122,19 +128,20 @@ enum blm_connection_state { * @bssid: BSSID of the AP * @reject_ap_type: Type of the rejection done with the BSSID * @reject_duration: time left till the AP is in the reject list. - * @expected_rssi: expected RSSI when the AP expects the connection to be made. - * @reject_reason: reason to add the BSSID to BLM - * @source: Source of adding the BSSID to BLM - * @received_time: Time at which the AP was added to blacklist. - * @original_timeout: Original timeout which the AP sent while blacklisting. + * @expected_rssi: expected RSSI when the AP expects the connection to be + * made. + * @reject_reason: reason to add the BSSID to DLM + * @source: Source of adding the BSSID to DLM + * @received_time: Time at which the AP was added to denylist. + * @original_timeout: Original timeout which the AP sent while denylisting. */ struct reject_ap_config_params { struct qdf_mac_addr bssid; - enum blm_reject_ap_type reject_ap_type; + enum dlm_reject_ap_type reject_ap_type; uint32_t reject_duration; int32_t expected_rssi; - enum blm_reject_ap_reason reject_reason; - enum blm_reject_ap_source source; + enum dlm_reject_ap_reason reject_reason; + enum dlm_reject_ap_source source; qdf_time_t received_time; uint32_t original_timeout; }; @@ -150,12 +157,12 @@ struct reject_ap_params { }; /** - * struct wlan_blm_tx_ops - structure of tx operation function - * pointers for blacklist manager component - * @blm_send_reject_ap_list: send reject ap list to fw + * struct wlan_dlm_tx_ops - structure of tx operation function + * pointers for denylist manager component + * @dlm_send_reject_ap_list: send reject ap list to fw */ -struct wlan_blm_tx_ops { - QDF_STATUS (*blm_send_reject_ap_list)(struct wlan_objmgr_pdev *pdev, +struct wlan_dlm_tx_ops { + QDF_STATUS (*dlm_send_reject_ap_list)(struct wlan_objmgr_pdev *pdev, struct reject_ap_params *reject_params); }; @@ -163,16 +170,17 @@ struct wlan_blm_tx_ops { * struct reject_ap_info - structure to specify the reject ap info. * @bssid: BSSID of the AP. * @rssi_reject_params: RSSI reject params of the AP is of type RSSI reject - * @reject_ap_type: Reject type of AP (eg. avoid, blacklist, rssi reject etc.) - * @reject_reason: reason to add the BSSID to BLM - * @source: Source of adding the BSSID to BLM + * @reject_ap_type: Reject type of AP (eg. avoid, denylist, rssi reject + * etc.) + * @reject_reason: reason to add the BSSID to DLM + * @source: Source of adding the BSSID to DLM */ struct reject_ap_info { struct qdf_mac_addr bssid; - struct blm_rssi_disallow_params rssi_reject_params; - enum blm_reject_ap_type reject_ap_type; - enum blm_reject_ap_reason reject_reason; - enum blm_reject_ap_source source; + struct dlm_rssi_disallow_params rssi_reject_params; + enum dlm_reject_ap_type reject_ap_type; + enum dlm_reject_ap_reason reject_reason; + enum dlm_reject_ap_source source; }; #endif diff --git a/components/blacklist_mgr/dispatcher/inc/wlan_blm_tgt_api.h b/components/blacklist_mgr/dispatcher/inc/wlan_blm_tgt_api.h index 6ca9e311b2..54cf939f84 100644 --- a/components/blacklist_mgr/dispatcher/inc/wlan_blm_tgt_api.h +++ b/components/blacklist_mgr/dispatcher/inc/wlan_blm_tgt_api.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. 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 @@ -16,26 +17,26 @@ * PERFORMANCE OF THIS SOFTWARE. */ /** - * DOC: Declare public API for blacklist manager to interact with target/WMI + * DOC: Declare public API for denylist manager to interact with target/WMI */ -#ifndef _WLAN_BLM_TGT_API_H -#define _WLAN_BLM_TGT_API_H +#ifndef _WLAN_DLM_TGT_API_H +#define _WLAN_DLM_TGT_API_H #include "wlan_blm_main.h" /** - * tgt_blm_send_reject_list_to_fw() - API to send the reject ap list to FW. + * tgt_dlm_send_reject_list_to_fw() - API to send the reject ap list to FW. * @pdev: pdev object * @reject_params: Reject params contains the bssid list, and num of bssids * - * This API will send the reject AP list maintained by the blacklist manager + * This API will send the reject AP list maintained by the denylist manager * to the target. * * Return: QDF status */ QDF_STATUS -tgt_blm_send_reject_list_to_fw(struct wlan_objmgr_pdev *pdev, +tgt_dlm_send_reject_list_to_fw(struct wlan_objmgr_pdev *pdev, struct reject_ap_params *reject_params); #endif diff --git a/components/blacklist_mgr/dispatcher/inc/wlan_blm_ucfg_api.h b/components/blacklist_mgr/dispatcher/inc/wlan_blm_ucfg_api.h index 31691ca9cb..72d67b685c 100644 --- a/components/blacklist_mgr/dispatcher/inc/wlan_blm_ucfg_api.h +++ b/components/blacklist_mgr/dispatcher/inc/wlan_blm_ucfg_api.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. 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 @@ -16,206 +17,206 @@ * PERFORMANCE OF THIS SOFTWARE. */ /** - * DOC: declare UCFG APIs exposed by the blacklist manager component + * DOC: declare UCFG APIs exposed by the denylist manager component */ -#ifndef _WLAN_BLM_UCFG_H_ -#define _WLAN_BLM_UCFG_H_ +#ifndef _WLAN_DLM_UCFG_H_ +#define _WLAN_DLM_UCFG_H_ #include "qdf_types.h" #include "wlan_objmgr_psoc_obj.h" #include -#ifdef FEATURE_BLACKLIST_MGR +#ifdef FEATURE_DENYLIST_MGR /** - * ucfg_blm_init() - initialize blacklist mgr context + * ucfg_dlm_init() - initialize denylist mgr context * - * This function initializes the blacklist mgr context + * This function initializes the denylist mgr context * * Return: QDF_STATUS_SUCCESS - in case of success else return error */ -QDF_STATUS ucfg_blm_init(void); +QDF_STATUS ucfg_dlm_init(void); /** - * ucfg_blm_deinit() - De initialize blacklist mgr context + * ucfg_dlm_deinit() - De initialize denylist mgr context * - * This function De initializes blacklist mgr context + * This function De initializes denylist mgr context * * Return: QDF_STATUS_SUCCESS - in case of success else return error */ -QDF_STATUS ucfg_blm_deinit(void); +QDF_STATUS ucfg_dlm_deinit(void); /** - * ucfg_blm_psoc_set_suspended() - API to set blacklist mgr state suspended + * ucfg_dlm_psoc_set_suspended() - API to set denylist mgr state suspended * @psoc: pointer to psoc object * @state: state to be set * - * This function sets blacklist mgr state to suspended + * This function sets denylist mgr state to suspended * * Return: QDF_STATUS_SUCCESS - in case of success else return error */ -QDF_STATUS ucfg_blm_psoc_set_suspended(struct wlan_objmgr_psoc *psoc, +QDF_STATUS ucfg_dlm_psoc_set_suspended(struct wlan_objmgr_psoc *psoc, bool state); /** - * ucfg_blm_psoc_get_suspended() - API to get blacklist mgr state suspended + * ucfg_dlm_psoc_get_suspended() - API to get denylist mgr state suspended * @psoc: pointer to psoc object - * @state: pointer to get suspend state of blacklist manager + * @state: pointer to get suspend state of denylist manager * * Return: QDF_STATUS_SUCCESS - in case of success else return error */ -QDF_STATUS ucfg_blm_psoc_get_suspended(struct wlan_objmgr_psoc *psoc, +QDF_STATUS ucfg_dlm_psoc_get_suspended(struct wlan_objmgr_psoc *psoc, bool *state); /** - * ucfg_blm_psoc_open() - API to initialize the cfg when psoc is initialized. + * ucfg_dlm_psoc_open() - API to initialize the cfg when psoc is initialized. * @psoc: psoc object * - * This function initializes the config of blacklist mgr. + * This function initializes the config of denylist mgr. * * Return: QDF_STATUS_SUCCESS - in case of success else return error */ -QDF_STATUS ucfg_blm_psoc_open(struct wlan_objmgr_psoc *psoc); +QDF_STATUS ucfg_dlm_psoc_open(struct wlan_objmgr_psoc *psoc); /** - * ucfg_blm_psoc_close() - API to deinit the blm when psoc is deinitialized. + * ucfg_dlm_psoc_close() - API to deinit the dlm when psoc is deinitialized. * @psoc: psoc object * - * This function deinits the blm psoc object. + * This function deinits the dlm psoc object. * * Return: QDF_STATUS_SUCCESS - in case of success else return error */ -QDF_STATUS ucfg_blm_psoc_close(struct wlan_objmgr_psoc *psoc); +QDF_STATUS ucfg_dlm_psoc_close(struct wlan_objmgr_psoc *psoc); /** - * ucfg_blm_add_userspace_black_list() - Clear already existing userspace BSSID, - * and add the new ones to blacklist manager. + * ucfg_dlm_add_userspace_deny_list() - Clear already existing userspace BSSID, + * and add the new ones to denylist manager. * @pdev: pdev object - * @bssid_black_list: BSSIDs to be blacklisted by userspace. - * @num_of_bssid: num of bssids to be blacklisted. + * @bssid_deny_list: BSSIDs to be denylisted by userspace. + * @num_of_bssid: num of bssids to be denylisted. * * This API clear already existing userspace BSSID, and add the new ones to - * blacklist manager + * denylist manager * * Return: QDF_STATUS_SUCCESS - in case of success else return error. */ QDF_STATUS -ucfg_blm_add_userspace_black_list(struct wlan_objmgr_pdev *pdev, - struct qdf_mac_addr *bssid_black_list, - uint8_t num_of_bssid); +ucfg_dlm_add_userspace_deny_list(struct wlan_objmgr_pdev *pdev, + struct qdf_mac_addr *bssid_deny_list, + uint8_t num_of_bssid); /** - * ucfg_blm_dump_black_list_ap() - get blacklisted bssid. + * ucfg_dlm_dump_deny_list_ap() - get denylisted bssid. * @pdev: pdev object * - * This API dumps blacklist ap + * This API dumps denylist ap * * Return: None */ -void ucfg_blm_dump_black_list_ap(struct wlan_objmgr_pdev *pdev); +void ucfg_dlm_dump_deny_list_ap(struct wlan_objmgr_pdev *pdev); /** - * ucfg_blm_update_bssid_connect_params() - Inform the BLM about connect or + * ucfg_dlm_update_bssid_connect_params() - Inform the DLM about connect or * disconnect with the current AP. * @pdev: pdev object * @bssid: BSSID of the AP * @con_state: Connection stae (connected/disconnected) * - * This API will inform the BLM about the state with the AP so that if the AP + * This API will inform the DLM about the state with the AP so that if the AP * is selected, and the connection went through, and the connection did not - * face any data stall till the bad bssid reset timer, BLM can remove the + * face any data stall till the bad bssid reset timer, DLM can remove the * AP from the reject ap list maintained by it. * * Return: None */ void -ucfg_blm_update_bssid_connect_params(struct wlan_objmgr_pdev *pdev, +ucfg_dlm_update_bssid_connect_params(struct wlan_objmgr_pdev *pdev, struct qdf_mac_addr bssid, - enum blm_connection_state con_state); + enum dlm_connection_state con_state); /** - * ucfg_blm_add_bssid_to_reject_list() - Add BSSID to the specific reject list. + * ucfg_dlm_add_bssid_to_reject_list() - Add BSSID to the specific reject list. * @pdev: Pdev object * @ap_info: Ap info params such as BSSID, and the type of rejection to be done * - * This API will add the BSSID to the reject AP list maintained by the blacklist + * This API will add the BSSID to the reject AP list maintained by the denylist * manager. * * Return: QDF_STATUS_SUCCESS - in case of success else return error. */ QDF_STATUS -ucfg_blm_add_bssid_to_reject_list(struct wlan_objmgr_pdev *pdev, +ucfg_dlm_add_bssid_to_reject_list(struct wlan_objmgr_pdev *pdev, struct reject_ap_info *ap_info); /** - * ucfg_blm_wifi_off() - Inform the blacklist manager about wifi off - * @blm_ctx: blacklist manager pdev priv object + * ucfg_dlm_wifi_off() - Inform the denylist manager about wifi off + * @dlm_ctx: denylist manager pdev priv object * - * This API will inform the blacklist manager that the user has turned wifi off - * from the UI, and the blacklist manager can take action based upon this. + * This API will inform the denylist manager that the user has turned wifi off + * from the UI, and the denylist manager can take action based upon this. * * Return: None */ void -ucfg_blm_wifi_off(struct wlan_objmgr_pdev *pdev); +ucfg_dlm_wifi_off(struct wlan_objmgr_pdev *pdev); #else static inline -QDF_STATUS ucfg_blm_init(void) +QDF_STATUS ucfg_dlm_init(void) { return QDF_STATUS_SUCCESS; } static inline -QDF_STATUS ucfg_blm_deinit(void) +QDF_STATUS ucfg_dlm_deinit(void) { return QDF_STATUS_SUCCESS; } static inline -QDF_STATUS ucfg_blm_psoc_open(struct wlan_objmgr_psoc *psoc) +QDF_STATUS ucfg_dlm_psoc_open(struct wlan_objmgr_psoc *psoc) { return QDF_STATUS_SUCCESS; } static inline -QDF_STATUS ucfg_blm_psoc_close(struct wlan_objmgr_psoc *psoc) +QDF_STATUS ucfg_dlm_psoc_close(struct wlan_objmgr_psoc *psoc) { return QDF_STATUS_SUCCESS; } static inline -void ucfg_blm_dump_black_list_ap(struct wlan_objmgr_pdev *pdev) +void ucfg_dlm_dump_deny_list_ap(struct wlan_objmgr_pdev *pdev) {} static inline QDF_STATUS -ucfg_blm_add_bssid_to_reject_list(struct wlan_objmgr_pdev *pdev, +ucfg_dlm_add_bssid_to_reject_list(struct wlan_objmgr_pdev *pdev, struct reject_ap_info *ap_info) { return QDF_STATUS_SUCCESS; } static inline QDF_STATUS -ucfg_blm_add_userspace_black_list(struct wlan_objmgr_pdev *pdev, - struct qdf_mac_addr *bssid_black_list, - uint8_t num_of_bssid) +ucfg_dlm_add_userspace_deny_list(struct wlan_objmgr_pdev *pdev, + struct qdf_mac_addr *bssid_deny_list, + uint8_t num_of_bssid) { return QDF_STATUS_SUCCESS; } static inline void -ucfg_blm_update_bssid_connect_params(struct wlan_objmgr_pdev *pdev, +ucfg_dlm_update_bssid_connect_params(struct wlan_objmgr_pdev *pdev, struct qdf_mac_addr bssid, - enum blm_connection_state con_state) + enum dlm_connection_state con_state) { } static inline -void ucfg_blm_wifi_off(struct wlan_objmgr_pdev *pdev) +void ucfg_dlm_wifi_off(struct wlan_objmgr_pdev *pdev) { } #endif -#endif /* _WLAN_BLM_UCFG_H_ */ +#endif /* _WLAN_DLM_UCFG_H_ */ diff --git a/components/blacklist_mgr/dispatcher/inc/wlan_cfg_blm.h b/components/blacklist_mgr/dispatcher/inc/wlan_cfg_blm.h index 47de605e12..4846fa15e2 100644 --- a/components/blacklist_mgr/dispatcher/inc/wlan_cfg_blm.h +++ b/components/blacklist_mgr/dispatcher/inc/wlan_cfg_blm.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. 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 @@ -17,13 +18,13 @@ */ /** - * DOC: This file contains ini params for blacklist mgr component + * DOC: This file contains ini params for denylist mgr component */ -#ifndef __CFG_BLM_H_ -#define __CFG_BLM_H_ +#ifndef __CFG_DLM_H_ +#define __CFG_DLM_H_ -#ifdef FEATURE_BLACKLIST_MGR +#ifdef FEATURE_DENYLIST_MGR /* * @@ -53,13 +54,13 @@ /* * - * bad_bssid_counter_thresh - Threshold to move the Ap from avoid to blacklist. + * bad_bssid_counter_thresh - Threshold to move the Ap from avoid to denylist. * @Min: 2 * @Max: 10 * @Default: 3 * * This ini is used to specify the threshld after which the BSSID which is in - * the avoid list should be moved to black list, assuming that the AP or the + * the avoid list should be moved to deny list, assuming that the AP or the * gateway with which the data stall happenend has no recovered, and now * the STA got the NUD failure again with the BSSID * @@ -79,14 +80,14 @@ /* * - * black_list_expiry_time - Config Param to move AP from blacklist to monitor + * deny_list_expiry_time - Config Param to move AP from denylist to monitor * list. * @Min: 1 minutes * @Max: 600 minutes * @Default: 10 minutes * * This ini is used to specify the time after which the BSSID which is in the - * black list should be moved to monitor list, assuming that the AP or the + * deny list should be moved to monitor list, assuming that the AP or the * gateway with which the data stall happenend might have recovered, and now * the STA can give another chance to connect to the AP. * @@ -96,13 +97,13 @@ * * */ -#define CFG_BLACK_LIST_EXPIRY_TIME CFG_INI_UINT( \ +#define CFG_DENY_LIST_EXPIRY_TIME CFG_INI_UINT( \ "black_list_expiry_time", \ 1, \ 600, \ 10, \ CFG_VALUE_OR_DEFAULT, \ - "black list expiry") + "deny list expiry") /* * @@ -135,14 +136,14 @@ /* * * delta_rssi - RSSI threshold value, only when AP rssi improves - * by threshold value entry would be removed from blacklist manager and assoc + * by threshold value entry would be removed from denylist manager and assoc * req would be sent by FW. * @Min: 0 * @Max: 10 * @Default: 5 * * This ini is used to specify the rssi threshold value, after rssi improves - * by threshold the BSSID which is in the blacklist manager list should be + * by threshold the BSSID which is in the denylist manager list should be * removed from the respective list. * * Supported Feature: Customer requirement @@ -151,7 +152,7 @@ * * */ -#define CFG_BLACKLIST_RSSI_THRESHOLD CFG_INI_INT( \ +#define CFG_DENYLIST_RSSI_THRESHOLD CFG_INI_INT( \ "delta_rssi", \ 0, \ 10, \ @@ -159,17 +160,17 @@ CFG_VALUE_OR_DEFAULT, \ "Configure delta RSSI") -#define CFG_BLACKLIST_MGR_ALL \ +#define CFG_DENYLIST_MGR_ALL \ CFG(CFG_AVOID_LIST_EXPIRY_TIME) \ CFG(CFG_BAD_BSSID_COUNTER_THRESHOLD) \ - CFG(CFG_BLACK_LIST_EXPIRY_TIME) \ + CFG(CFG_DENY_LIST_EXPIRY_TIME) \ CFG(CFG_BAD_BSSID_RESET_TIME) \ - CFG(CFG_BLACKLIST_RSSI_THRESHOLD) + CFG(CFG_DENYLIST_RSSI_THRESHOLD) #else -#define CFG_BLACKLIST_MGR_ALL +#define CFG_DENYLIST_MGR_ALL -#endif /* FEATURE_BLACKLIST_MGR */ +#endif /* FEATURE_DENYLIST_MGR */ -#endif /* __CFG_BLACKLIST_MGR */ +#endif /* __CFG_DENYLIST_MGR */ diff --git a/components/blacklist_mgr/dispatcher/src/wlan_blm_tgt_api.c b/components/blacklist_mgr/dispatcher/src/wlan_blm_tgt_api.c index db9ae0dd90..e1a4947ca0 100644 --- a/components/blacklist_mgr/dispatcher/src/wlan_blm_tgt_api.c +++ b/components/blacklist_mgr/dispatcher/src/wlan_blm_tgt_api.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. 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 @@ -16,34 +17,34 @@ * PERFORMANCE OF THIS SOFTWARE. */ /** - * DOC: Implements public API for blacklist manager to interact with target/WMI + * DOC: Implements public API for denylist manager to interact with target/WMI */ #include "wlan_blm_tgt_api.h" #if defined(WLAN_FEATURE_ROAM_OFFLOAD) QDF_STATUS -tgt_blm_send_reject_list_to_fw(struct wlan_objmgr_pdev *pdev, +tgt_dlm_send_reject_list_to_fw(struct wlan_objmgr_pdev *pdev, struct reject_ap_params *reject_params) { - struct wlan_blm_tx_ops *blm_tx_ops; - struct blm_pdev_priv_obj *blm_priv; + struct wlan_dlm_tx_ops *dlm_tx_ops; + struct dlm_pdev_priv_obj *dlm_priv; - blm_priv = blm_get_pdev_obj(pdev); + dlm_priv = dlm_get_pdev_obj(pdev); - if (!blm_priv) { - blm_err("blm_priv is NULL"); + if (!dlm_priv) { + dlm_err("dlm_priv is NULL"); return QDF_STATUS_E_FAILURE; } - blm_tx_ops = &blm_priv->blm_tx_ops; - if (!blm_tx_ops) { - blm_err("blm_tx_ops is NULL"); + dlm_tx_ops = &dlm_priv->dlm_tx_ops; + if (!dlm_tx_ops) { + dlm_err("dlm_tx_ops is NULL"); return QDF_STATUS_E_FAILURE; } - if (blm_tx_ops->blm_send_reject_ap_list) - return blm_tx_ops->blm_send_reject_ap_list(pdev, reject_params); - blm_err("Tx ops not registered, failed to send reject list to FW"); + if (dlm_tx_ops->dlm_send_reject_ap_list) + return dlm_tx_ops->dlm_send_reject_ap_list(pdev, reject_params); + dlm_err("Tx ops not registered, failed to send reject list to FW"); return QDF_STATUS_E_FAILURE; } diff --git a/components/blacklist_mgr/dispatcher/src/wlan_blm_ucfg_api.c b/components/blacklist_mgr/dispatcher/src/wlan_blm_ucfg_api.c index 9bda6af227..ed2d4d1168 100644 --- a/components/blacklist_mgr/dispatcher/src/wlan_blm_ucfg_api.c +++ b/components/blacklist_mgr/dispatcher/src/wlan_blm_ucfg_api.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. 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 @@ -16,7 +17,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ /** - * DOC: define UCFG APIs exposed by the blacklist mgr component + * DOC: define UCFG APIs exposed by the denylist mgr component */ #include @@ -24,229 +25,229 @@ #include #include "wlan_pmo_obj_mgmt_api.h" -QDF_STATUS ucfg_blm_init(void) +QDF_STATUS ucfg_dlm_init(void) { QDF_STATUS status; status = wlan_objmgr_register_pdev_create_handler( - WLAN_UMAC_COMP_BLACKLIST_MGR, - blm_pdev_object_created_notification, + WLAN_UMAC_COMP_DENYLIST_MGR, + dlm_pdev_object_created_notification, NULL); if (QDF_IS_STATUS_ERROR(status)) { - blm_err("pdev create register notification failed"); + dlm_err("pdev create register notification failed"); goto fail_create_pdev; } status = wlan_objmgr_register_pdev_destroy_handler( - WLAN_UMAC_COMP_BLACKLIST_MGR, - blm_pdev_object_destroyed_notification, + WLAN_UMAC_COMP_DENYLIST_MGR, + dlm_pdev_object_destroyed_notification, NULL); if (QDF_IS_STATUS_ERROR(status)) { - blm_err("pdev destroy register notification failed"); + dlm_err("pdev destroy register notification failed"); goto fail_destroy_pdev; } status = wlan_objmgr_register_psoc_create_handler( - WLAN_UMAC_COMP_BLACKLIST_MGR, - blm_psoc_object_created_notification, + WLAN_UMAC_COMP_DENYLIST_MGR, + dlm_psoc_object_created_notification, NULL); if (QDF_IS_STATUS_ERROR(status)) { - blm_err("psoc create register notification failed"); + dlm_err("psoc create register notification failed"); goto fail_create_psoc; } status = wlan_objmgr_register_psoc_destroy_handler( - WLAN_UMAC_COMP_BLACKLIST_MGR, - blm_psoc_object_destroyed_notification, + WLAN_UMAC_COMP_DENYLIST_MGR, + dlm_psoc_object_destroyed_notification, NULL); if (QDF_IS_STATUS_ERROR(status)) { - blm_err("psoc destroy register notification failed"); + dlm_err("psoc destroy register notification failed"); goto fail_destroy_psoc; } return QDF_STATUS_SUCCESS; fail_destroy_psoc: - wlan_objmgr_unregister_psoc_create_handler(WLAN_UMAC_COMP_BLACKLIST_MGR, - blm_psoc_object_created_notification, NULL); + wlan_objmgr_unregister_psoc_create_handler(WLAN_UMAC_COMP_DENYLIST_MGR, + dlm_psoc_object_created_notification, NULL); fail_create_psoc: wlan_objmgr_unregister_pdev_destroy_handler( - WLAN_UMAC_COMP_BLACKLIST_MGR, - blm_pdev_object_destroyed_notification, NULL); + WLAN_UMAC_COMP_DENYLIST_MGR, + dlm_pdev_object_destroyed_notification, NULL); fail_destroy_pdev: - wlan_objmgr_unregister_pdev_create_handler(WLAN_UMAC_COMP_BLACKLIST_MGR, - blm_pdev_object_created_notification, NULL); + wlan_objmgr_unregister_pdev_create_handler(WLAN_UMAC_COMP_DENYLIST_MGR, + dlm_pdev_object_created_notification, NULL); fail_create_pdev: return status; } -QDF_STATUS ucfg_blm_deinit(void) +QDF_STATUS ucfg_dlm_deinit(void) { QDF_STATUS status; status = wlan_objmgr_unregister_psoc_destroy_handler( - WLAN_UMAC_COMP_BLACKLIST_MGR, - blm_psoc_object_destroyed_notification, + WLAN_UMAC_COMP_DENYLIST_MGR, + dlm_psoc_object_destroyed_notification, NULL); status = wlan_objmgr_unregister_psoc_create_handler( - WLAN_UMAC_COMP_BLACKLIST_MGR, - blm_psoc_object_created_notification, + WLAN_UMAC_COMP_DENYLIST_MGR, + dlm_psoc_object_created_notification, NULL); status = wlan_objmgr_unregister_pdev_destroy_handler( - WLAN_UMAC_COMP_BLACKLIST_MGR, - blm_pdev_object_destroyed_notification, + WLAN_UMAC_COMP_DENYLIST_MGR, + dlm_pdev_object_destroyed_notification, NULL); status = wlan_objmgr_unregister_pdev_create_handler( - WLAN_UMAC_COMP_BLACKLIST_MGR, - blm_pdev_object_created_notification, + WLAN_UMAC_COMP_DENYLIST_MGR, + dlm_pdev_object_created_notification, NULL); return status; } -QDF_STATUS ucfg_blm_psoc_set_suspended(struct wlan_objmgr_psoc *psoc, +QDF_STATUS ucfg_dlm_psoc_set_suspended(struct wlan_objmgr_psoc *psoc, bool state) { - struct blm_psoc_priv_obj *blm_psoc_obj; + struct dlm_psoc_priv_obj *dlm_psoc_obj; - blm_psoc_obj = blm_get_psoc_obj(psoc); + dlm_psoc_obj = dlm_get_psoc_obj(psoc); - if (!blm_psoc_obj) { - blm_err("BLM psoc obj NULL"); + if (!dlm_psoc_obj) { + dlm_err("DLM psoc obj NULL"); return QDF_STATUS_E_FAILURE; } - blm_psoc_obj->is_suspended = state; + dlm_psoc_obj->is_suspended = state; return QDF_STATUS_SUCCESS; } -QDF_STATUS ucfg_blm_psoc_get_suspended(struct wlan_objmgr_psoc *psoc, +QDF_STATUS ucfg_dlm_psoc_get_suspended(struct wlan_objmgr_psoc *psoc, bool *state) { - struct blm_psoc_priv_obj *blm_psoc_obj; + struct dlm_psoc_priv_obj *dlm_psoc_obj; - blm_psoc_obj = blm_get_psoc_obj(psoc); + dlm_psoc_obj = dlm_get_psoc_obj(psoc); - if (!blm_psoc_obj) { - blm_err("BLM psoc obj NULL"); + if (!dlm_psoc_obj) { + dlm_err("DLM psoc obj NULL"); *state = true; return QDF_STATUS_E_FAILURE; } - *state = blm_psoc_obj->is_suspended; + *state = dlm_psoc_obj->is_suspended; return QDF_STATUS_SUCCESS; } static QDF_STATUS -ucfg_blm_suspend_handler(struct wlan_objmgr_psoc *psoc, void *arg) +ucfg_dlm_suspend_handler(struct wlan_objmgr_psoc *psoc, void *arg) { - ucfg_blm_psoc_set_suspended(psoc, true); + ucfg_dlm_psoc_set_suspended(psoc, true); return QDF_STATUS_SUCCESS; } static QDF_STATUS -ucfg_blm_resume_handler(struct wlan_objmgr_psoc *psoc, void *arg) +ucfg_dlm_resume_handler(struct wlan_objmgr_psoc *psoc, void *arg) { - ucfg_blm_psoc_set_suspended(psoc, false); - blm_update_reject_ap_list_to_fw(psoc); + ucfg_dlm_psoc_set_suspended(psoc, false); + dlm_update_reject_ap_list_to_fw(psoc); return QDF_STATUS_SUCCESS; } static inline void -ucfg_blm_register_pmo_handler(void) +ucfg_dlm_register_pmo_handler(void) { - pmo_register_suspend_handler(WLAN_UMAC_COMP_BLACKLIST_MGR, - ucfg_blm_suspend_handler, NULL); - pmo_register_resume_handler(WLAN_UMAC_COMP_BLACKLIST_MGR, - ucfg_blm_resume_handler, NULL); + pmo_register_suspend_handler(WLAN_UMAC_COMP_DENYLIST_MGR, + ucfg_dlm_suspend_handler, NULL); + pmo_register_resume_handler(WLAN_UMAC_COMP_DENYLIST_MGR, + ucfg_dlm_resume_handler, NULL); } static inline void -ucfg_blm_unregister_pmo_handler(void) +ucfg_dlm_unregister_pmo_handler(void) { - pmo_unregister_suspend_handler(WLAN_UMAC_COMP_BLACKLIST_MGR, - ucfg_blm_suspend_handler); - pmo_unregister_resume_handler(WLAN_UMAC_COMP_BLACKLIST_MGR, - ucfg_blm_resume_handler); + pmo_unregister_suspend_handler(WLAN_UMAC_COMP_DENYLIST_MGR, + ucfg_dlm_suspend_handler); + pmo_unregister_resume_handler(WLAN_UMAC_COMP_DENYLIST_MGR, + ucfg_dlm_resume_handler); } -QDF_STATUS ucfg_blm_psoc_open(struct wlan_objmgr_psoc *psoc) +QDF_STATUS ucfg_dlm_psoc_open(struct wlan_objmgr_psoc *psoc) { - ucfg_blm_register_pmo_handler(); - return blm_cfg_psoc_open(psoc); + ucfg_dlm_register_pmo_handler(); + return dlm_cfg_psoc_open(psoc); } -QDF_STATUS ucfg_blm_psoc_close(struct wlan_objmgr_psoc *psoc) +QDF_STATUS ucfg_dlm_psoc_close(struct wlan_objmgr_psoc *psoc) { - ucfg_blm_unregister_pmo_handler(); + ucfg_dlm_unregister_pmo_handler(); return QDF_STATUS_SUCCESS; } QDF_STATUS -ucfg_blm_add_bssid_to_reject_list(struct wlan_objmgr_pdev *pdev, +ucfg_dlm_add_bssid_to_reject_list(struct wlan_objmgr_pdev *pdev, struct reject_ap_info *ap_info) { - return blm_add_bssid_to_reject_list(pdev, ap_info); + return dlm_add_bssid_to_reject_list(pdev, ap_info); } QDF_STATUS -ucfg_blm_add_userspace_black_list(struct wlan_objmgr_pdev *pdev, - struct qdf_mac_addr *bssid_black_list, - uint8_t num_of_bssid) +ucfg_dlm_add_userspace_deny_list(struct wlan_objmgr_pdev *pdev, + struct qdf_mac_addr *bssid_deny_list, + uint8_t num_of_bssid) { - return blm_add_userspace_black_list(pdev, bssid_black_list, + return dlm_add_userspace_deny_list(pdev, bssid_deny_list, num_of_bssid); } void -ucfg_blm_dump_black_list_ap(struct wlan_objmgr_pdev *pdev) +ucfg_dlm_dump_deny_list_ap(struct wlan_objmgr_pdev *pdev) { - return wlan_blm_dump_blcklist_bssid(pdev); + return wlan_dlm_dump_blcklist_bssid(pdev); } void -ucfg_blm_update_bssid_connect_params(struct wlan_objmgr_pdev *pdev, +ucfg_dlm_update_bssid_connect_params(struct wlan_objmgr_pdev *pdev, struct qdf_mac_addr bssid, - enum blm_connection_state con_state) + enum dlm_connection_state con_state) { - wlan_blm_update_bssid_connect_params(pdev, bssid, con_state); + wlan_dlm_update_bssid_connect_params(pdev, bssid, con_state); } void -ucfg_blm_wifi_off(struct wlan_objmgr_pdev *pdev) +ucfg_dlm_wifi_off(struct wlan_objmgr_pdev *pdev) { - struct blm_pdev_priv_obj *blm_ctx; - struct blm_psoc_priv_obj *blm_psoc_obj; - struct blm_config *cfg; + struct dlm_pdev_priv_obj *dlm_ctx; + struct dlm_psoc_priv_obj *dlm_psoc_obj; + struct dlm_config *cfg; QDF_STATUS status; if (!pdev) { - blm_err("pdev is NULL"); + dlm_err("pdev is NULL"); return; } - blm_ctx = blm_get_pdev_obj(pdev); - blm_psoc_obj = blm_get_psoc_obj(wlan_pdev_get_psoc(pdev)); + dlm_ctx = dlm_get_pdev_obj(pdev); + dlm_psoc_obj = dlm_get_psoc_obj(wlan_pdev_get_psoc(pdev)); - if (!blm_ctx || !blm_psoc_obj) { - blm_err("blm_ctx or blm_psoc_obj is NULL"); - return ; + if (!dlm_ctx || !dlm_psoc_obj) { + dlm_err("dlm_ctx or dlm_psoc_obj is NULL"); + return; } - status = qdf_mutex_acquire(&blm_ctx->reject_ap_list_lock); + status = qdf_mutex_acquire(&dlm_ctx->reject_ap_list_lock); if (QDF_IS_STATUS_ERROR(status)) { - blm_err("failed to acquire reject_ap_list_lock"); + dlm_err("failed to acquire reject_ap_list_lock"); return; } - cfg = &blm_psoc_obj->blm_cfg; + cfg = &dlm_psoc_obj->dlm_cfg; - blm_flush_reject_ap_list(blm_ctx); - blm_send_reject_ap_list_to_fw(pdev, &blm_ctx->reject_ap_list, cfg); - qdf_mutex_release(&blm_ctx->reject_ap_list_lock); + dlm_flush_reject_ap_list(dlm_ctx); + dlm_send_reject_ap_list_to_fw(pdev, &dlm_ctx->reject_ap_list, cfg); + qdf_mutex_release(&dlm_ctx->reject_ap_list_lock); } diff --git a/components/cfg/cfg_all.h b/components/cfg/cfg_all.h index ef7be0e20f..0d360b4bcb 100644 --- a/components/cfg/cfg_all.h +++ b/components/cfg/cfg_all.h @@ -53,7 +53,7 @@ /* Maintain Alphabetic order here while adding components */ #define CFG_ALL \ - CFG_BLACKLIST_MGR_ALL \ + CFG_DENYLIST_MGR_ALL \ CFG_CONVERGED_ALL \ CFG_FWOL_ALL \ CFG_POLICY_MGR_ALL \ diff --git a/components/target_if/blacklist_mgr/inc/target_if_blm.h b/components/target_if/blacklist_mgr/inc/target_if_blm.h index 83e7f8a57d..1f038dde3b 100644 --- a/components/target_if/blacklist_mgr/inc/target_if_blm.h +++ b/components/target_if/blacklist_mgr/inc/target_if_blm.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. 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 @@ -16,19 +17,19 @@ * PERFORMANCE OF THIS SOFTWARE. */ /** - * DOC: Target interface file for blacklist manager component to - * declare api's which shall be used by blacklist manager component + * DOC: Target interface file for denylist manager component to + * declare api's which shall be used by denylist manager component * in target if internally. */ -#ifndef __TARGET_IF_BLM_H -#define __TARGET_IF_BLM_H +#ifndef __TARGET_IF_DLM_H +#define __TARGET_IF_DLM_H #include "wlan_blm_public_struct.h" #if defined(WLAN_FEATURE_ROAM_OFFLOAD) /** - * target_if_blm_send_reject_ap_list() - API to send reject ap list to FW + * target_if_dlm_send_reject_ap_list() - API to send reject ap list to FW * @pdev: pdev object * @reject_params: This contains the reject ap list, and the num of BSSIDs * @@ -38,24 +39,24 @@ * Return: Qdf status */ QDF_STATUS -target_if_blm_send_reject_ap_list(struct wlan_objmgr_pdev *pdev, +target_if_dlm_send_reject_ap_list(struct wlan_objmgr_pdev *pdev, struct reject_ap_params *reject_params); /** - * target_if_blm_register_tx_ops() - Register blm tx ops - * @blm_tx_ops: BLM tx ops + * target_if_dlm_register_tx_ops() - Register dlm tx ops + * @dlm_tx_ops: DLM tx ops * - * This API will register the tx ops used by the BLM to send commands to the + * This API will register the tx ops used by the DLM to send commands to the * target. * * Return: void */ -void target_if_blm_register_tx_ops(struct wlan_blm_tx_ops *blm_tx_ops); +void target_if_dlm_register_tx_ops(struct wlan_dlm_tx_ops *dlm_tx_ops); #else -static inline void target_if_blm_register_tx_ops( - struct wlan_blm_tx_ops *blm_tx_ops) +static inline void target_if_dlm_register_tx_ops( + struct wlan_dlm_tx_ops *dlm_tx_ops) { } #endif //WLAN_FEATURE_ROAM_OFFLOAD -#endif //__TARGET_IF_BLM_H +#endif //__TARGET_IF_DLM_H diff --git a/components/target_if/blacklist_mgr/src/target_if_blm.c b/components/target_if/blacklist_mgr/src/target_if_blm.c index 2a3102b330..c0606e8cf1 100644 --- a/components/target_if/blacklist_mgr/src/target_if_blm.c +++ b/components/target_if/blacklist_mgr/src/target_if_blm.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. 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 @@ -16,8 +17,8 @@ * PERFORMANCE OF THIS SOFTWARE. */ /** - * DOC: Target interface file for blacklist manager component to - * Implement api's which shall be used by blacklist manager component + * DOC: Target interface file for denylist manager component to + * Implement api's which shall be used by denylist manager component * in target if internally. */ @@ -26,7 +27,7 @@ #if defined(WLAN_FEATURE_ROAM_OFFLOAD) QDF_STATUS -target_if_blm_send_reject_ap_list(struct wlan_objmgr_pdev *pdev, +target_if_dlm_send_reject_ap_list(struct wlan_objmgr_pdev *pdev, struct reject_ap_params *reject_params) { struct wmi_unified *wmi_handle; @@ -40,13 +41,13 @@ target_if_blm_send_reject_ap_list(struct wlan_objmgr_pdev *pdev, return wmi_unified_send_reject_ap_list(wmi_handle, reject_params); } -void target_if_blm_register_tx_ops(struct wlan_blm_tx_ops *blm_tx_ops) +void target_if_dlm_register_tx_ops(struct wlan_dlm_tx_ops *dlm_tx_ops) { - if (!blm_tx_ops) { - target_if_err("blm_tx_ops is null"); + if (!dlm_tx_ops) { + target_if_err("dlm_tx_ops is null"); return; } - blm_tx_ops->blm_send_reject_ap_list = target_if_blm_send_reject_ap_list; + dlm_tx_ops->dlm_send_reject_ap_list = target_if_dlm_send_reject_ap_list; } #endif diff --git a/components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_fw_sync.c b/components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_fw_sync.c index 1170e62623..72bd88d501 100644 --- a/components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_fw_sync.c +++ b/components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_fw_sync.c @@ -144,10 +144,10 @@ cm_fw_roam_sync_start_ind(struct wlan_objmgr_vdev *vdev, wlan_mlme_get_bssid_vdev_id(pdev, vdev_id, &connected_bssid); - /* Update the BLM that the previous profile has disconnected */ - wlan_blm_update_bssid_connect_params(pdev, + /* Update the DLM that the previous profile has disconnected */ + wlan_dlm_update_bssid_connect_params(pdev, connected_bssid, - BLM_AP_DISCONNECTED); + DLM_AP_DISCONNECTED); if (IS_ROAM_REASON_STA_KICKOUT(roam_reason)) { struct reject_ap_info ap_info; @@ -156,7 +156,7 @@ cm_fw_roam_sync_start_ind(struct wlan_objmgr_vdev *vdev, ap_info.reject_ap_type = DRIVER_AVOID_TYPE; ap_info.reject_reason = REASON_STA_KICKOUT; ap_info.source = ADDED_BY_DRIVER; - wlan_blm_add_bssid_to_reject_list(pdev, &ap_info); + wlan_dlm_add_bssid_to_reject_list(pdev, &ap_info); } cm_update_scan_mlme_on_roam(vdev, &connected_bssid, @@ -1096,7 +1096,7 @@ static QDF_STATUS cm_handle_ho_fail(struct scheduler_msg *msg) ap_info.reject_ap_type = DRIVER_AVOID_TYPE; ap_info.reject_reason = REASON_ROAM_HO_FAILURE; ap_info.source = ADDED_BY_DRIVER; - wlan_blm_add_bssid_to_reject_list(pdev, &ap_info); + wlan_dlm_add_bssid_to_reject_list(pdev, &ap_info); cm_ho_fail_diag_event(); wlan_roam_debug_log(ind->vdev_id, diff --git a/components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_offload.c b/components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_offload.c index 13e5eef207..f3e1569f0e 100644 --- a/components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_offload.c +++ b/components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_offload.c @@ -1969,9 +1969,9 @@ cm_add_blacklist_ap_list(struct wlan_objmgr_pdev *pdev, return; params->num_bssid_black_list = - wlan_blm_get_bssid_reject_list(pdev, reject_list, + wlan_dlm_get_bssid_reject_list(pdev, reject_list, MAX_RSSI_AVOID_BSSID_LIST, - USERSPACE_BLACKLIST_TYPE); + USERSPACE_DENYLIST_TYPE); if (!params->num_bssid_black_list) { qdf_mem_free(reject_list); return; @@ -2058,7 +2058,7 @@ cm_roam_scan_filter(struct wlan_objmgr_psoc *psoc, * until RSSI OR time condition are matched. */ params->num_rssi_rejection_ap = - wlan_blm_get_bssid_reject_list(pdev, + wlan_dlm_get_bssid_reject_list(pdev, params->rssi_rejection_ap, MAX_RSSI_AVOID_BSSID_LIST, DRIVER_RSSI_REJECT_TYPE); @@ -2104,7 +2104,7 @@ cm_roam_scan_filter(struct wlan_objmgr_psoc *psoc, params->num_ssid_white_list = num_ssid_white_list; params->num_bssid_preferred_list = num_bssid_preferred_list; params->delta_rssi = - wlan_blm_get_rssi_blacklist_threshold(pdev); + wlan_dlm_get_rssi_denylist_threshold(pdev); for (i = 0; i < num_ssid_white_list; i++) { qdf_mem_copy(params->ssid_allowed_list[i].ssid, diff --git a/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h b/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h index fe89ce738f..21dac80d0a 100644 --- a/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h +++ b/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h @@ -2045,18 +2045,18 @@ enum roam_reason { * @timeout: time duration for which the bssid is blacklisted * @received_time: boot timestamp at which the firmware event was received * @rssi: rssi value for which the bssid is blacklisted - * @reject_reason: reason to add the BSSID to BLM + * @reject_reason: reason to add the BSSID to DLM * @original_timeout: original timeout sent by the AP - * @source: Source of adding the BSSID to BLM + * @source: Source of adding the BSSID to DLM */ struct roam_blacklist_timeout { struct qdf_mac_addr bssid; uint32_t timeout; qdf_time_t received_time; int32_t rssi; - enum blm_reject_ap_reason reject_reason; + enum dlm_reject_ap_reason reject_reason; uint32_t original_timeout; - enum blm_reject_ap_source source; + enum dlm_reject_ap_source source; }; /* diff --git a/components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_api.c b/components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_api.c index 00ed600984..d27e8c3868 100644 --- a/components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_api.c +++ b/components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_api.c @@ -2523,8 +2523,8 @@ cm_add_bssid_to_reject_list(struct wlan_objmgr_pdev *pdev, ap_info.source = entry->source; ap_info.rssi_reject_params.received_time = entry->received_time; ap_info.rssi_reject_params.original_timeout = entry->original_timeout; - /* Add this ap info to the rssi reject ap type in blacklist manager */ - wlan_blm_add_bssid_to_reject_list(pdev, &ap_info); + /* Add this ap info to the rssi reject ap type in denylist manager */ + wlan_dlm_add_bssid_to_reject_list(pdev, &ap_info); } QDF_STATUS diff --git a/components/wmi/src/wmi_unified_roam_tlv.c b/components/wmi/src/wmi_unified_roam_tlv.c index 2ccc2c940b..f82caa5fc2 100644 --- a/components/wmi/src/wmi_unified_roam_tlv.c +++ b/components/wmi/src/wmi_unified_roam_tlv.c @@ -2654,7 +2654,7 @@ end: return status; } -static enum blm_reject_ap_reason wmi_get_reject_reason(uint32_t reason) +static enum dlm_reject_ap_reason wmi_get_reject_reason(uint32_t reason) { switch (reason) { case WMI_BL_REASON_NUD_FAILURE: diff --git a/configs/default_defconfig b/configs/default_defconfig index 316b78dd7a..7f07219233 100644 --- a/configs/default_defconfig +++ b/configs/default_defconfig @@ -1139,7 +1139,7 @@ CONFIG_REG_CLIENT := y CONFIG_WLAN_PMO_ENABLE := y CONFIG_CONVERGED_P2P_ENABLE := y CONFIG_WLAN_POLICY_MGR_ENABLE := y -CONFIG_FEATURE_BLACKLIST_MGR := y +CONFIG_FEATURE_DENYLIST_MGR := y CONFIG_FOURTH_CONNECTION := y CONFIG_SUPPORT_11AX := y CONFIG_HDD_INIT_WITH_RTNL_LOCK := y diff --git a/configs/qca6390_defconfig b/configs/qca6390_defconfig index 4ddd386b6c..b32c7217c2 100644 --- a/configs/qca6390_defconfig +++ b/configs/qca6390_defconfig @@ -652,7 +652,7 @@ CONFIG_REG_CLIENT := y CONFIG_WLAN_PMO_ENABLE := y CONFIG_CONVERGED_P2P_ENABLE := y CONFIG_WLAN_POLICY_MGR_ENABLE := y -CONFIG_FEATURE_BLACKLIST_MGR := y +CONFIG_FEATURE_DENYLIST_MGR := y CONFIG_SUPPORT_11AX := y CONFIG_HDD_INIT_WITH_RTNL_LOCK := y CONFIG_WLAN_CONV_SPECTRAL_ENABLE := y diff --git a/configs/qcn7605_defconfig b/configs/qcn7605_defconfig index aff59b6b12..5f2dc2af31 100644 --- a/configs/qcn7605_defconfig +++ b/configs/qcn7605_defconfig @@ -6,8 +6,8 @@ CONFIG_WLAN_MAX_VDEVS := 5 # Flag to enable/disable TARGET 11d scan CONFIG_TARGET_11D_SCAN := y -# Enable BLACKLIST_MGR -CONFIG_FEATURE_BLACKLIST_MGR := y +# Enable DENYLIST_MGR +CONFIG_FEATURE_DENYLIST_MGR := y CONFIG_WLAN_FEATURE_LINK_LAYER_STATS := y # Enable Thermal throttle diff --git a/configs/wear_defconfig b/configs/wear_defconfig index b3db7bf45a..d30a9a3a04 100644 --- a/configs/wear_defconfig +++ b/configs/wear_defconfig @@ -859,7 +859,7 @@ CONFIG_REG_CLIENT := y CONFIG_WLAN_PMO_ENABLE := y CONFIG_CONVERGED_P2P_ENABLE := y CONFIG_WLAN_POLICY_MGR_ENABLE := y -CONFIG_FEATURE_BLACKLIST_MGR := y +CONFIG_FEATURE_DENYLIST_MGR := y CONFIG_FOURTH_CONNECTION := y CONFIG_SUPPORT_11AX := y CONFIG_HDD_INIT_WITH_RTNL_LOCK := y diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index d9ffcaff74..6c353143c5 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -4587,24 +4587,24 @@ static int hdd_set_blacklist_bssid(struct hdd_context *hdd_ctx, uint8_t j = 0; struct nlattr *tb2[MAX_ROAMING_PARAM + 1]; struct nlattr *curr_attr = NULL; - struct qdf_mac_addr *black_list_bssid; + struct qdf_mac_addr *deny_list_bssid; mac_handle_t mac_handle; - /* Parse and fetch number of blacklist BSSID */ + /* Parse and fetch number of denylist BSSID */ if (!tb[PARAMS_NUM_BSSID]) { - hdd_err("attr num of blacklist bssid failed"); + hdd_err("attr num of denylist bssid failed"); goto fail; } count = nla_get_u32(tb[PARAMS_NUM_BSSID]); if (count > MAX_BSSID_AVOID_LIST) { - hdd_err("Blacklist BSSID count %u exceeds max %u", + hdd_err("Denylist BSSID count %u exceeds max %u", count, MAX_BSSID_AVOID_LIST); goto fail; } - hdd_debug("Num of blacklist BSSID (%d)", count); - black_list_bssid = qdf_mem_malloc(sizeof(*black_list_bssid) * + hdd_debug("Num of denylist BSSID (%d)", count); + deny_list_bssid = qdf_mem_malloc(sizeof(*deny_list_bssid) * MAX_BSSID_AVOID_LIST); - if (!black_list_bssid) + if (!deny_list_bssid) goto fail; i = 0; @@ -4613,7 +4613,7 @@ static int hdd_set_blacklist_bssid(struct hdd_context *hdd_ctx, tb[PARAM_BSSID_PARAMS], rem) { if (i == count) { - hdd_warn("Ignoring excess Blacklist BSSID"); + hdd_warn("Ignoring excess Denylist BSSID"); break; } @@ -4623,13 +4623,13 @@ static int hdd_set_blacklist_bssid(struct hdd_context *hdd_ctx, nla_len(curr_attr), wlan_hdd_set_roam_param_policy)) { hdd_err("nla_parse failed"); - qdf_mem_free(black_list_bssid); + qdf_mem_free(deny_list_bssid); goto fail; } /* Parse and fetch MAC address */ if (!tb2[PARAM_SET_BSSID]) { - hdd_err("attr blacklist addr failed"); - qdf_mem_free(black_list_bssid); + hdd_err("attr denylist addr failed"); + qdf_mem_free(deny_list_bssid); goto fail; } if (tb2[PARAM_SET_BSSID_HINT]) { @@ -4645,28 +4645,28 @@ static int hdd_set_blacklist_bssid(struct hdd_context *hdd_ctx, REASON_USERSPACE_AVOID_LIST; ap_info.source = ADDED_BY_DRIVER; - /* This BSSID is avoided and not blacklisted */ - ucfg_blm_add_bssid_to_reject_list(hdd_ctx->pdev, + /* This BSSID is avoided and not denylisted */ + ucfg_dlm_add_bssid_to_reject_list(hdd_ctx->pdev, &ap_info); i++; continue; } - nla_memcpy(black_list_bssid[j].bytes, + nla_memcpy(deny_list_bssid[j].bytes, tb2[PARAM_SET_BSSID], QDF_MAC_ADDR_SIZE); hdd_debug(QDF_MAC_ADDR_FMT, - QDF_MAC_ADDR_REF(black_list_bssid[j].bytes)); + QDF_MAC_ADDR_REF(deny_list_bssid[j].bytes)); i++; j++; } } if (i < count) - hdd_warn("Num Blacklist BSSID %u less than expected %u", + hdd_warn("Num Denylist BSSID %u less than expected %u", i, count); - /* Send the blacklist to the blacklist mgr component */ - ucfg_blm_add_userspace_black_list(hdd_ctx->pdev, black_list_bssid, j); - qdf_mem_free(black_list_bssid); + /* Send the denylist to the denylist mgr component */ + ucfg_dlm_add_userspace_deny_list(hdd_ctx->pdev, deny_list_bssid, j); + qdf_mem_free(deny_list_bssid); mac_handle = hdd_ctx->mac_handle; sme_update_roam_params(mac_handle, vdev_id, rso_config, REASON_ROAM_SET_BLACKLIST_BSSID); diff --git a/core/hdd/src/wlan_hdd_cm_connect.c b/core/hdd/src/wlan_hdd_cm_connect.c index 2bd43f44d1..3dc3c85984 100644 --- a/core/hdd/src/wlan_hdd_cm_connect.c +++ b/core/hdd/src/wlan_hdd_cm_connect.c @@ -618,7 +618,7 @@ int wlan_hdd_cm_connect(struct wiphy *wiphy, } qdf_mem_zero(¶ms, sizeof(params)); - ucfg_blm_dump_black_list_ap(hdd_ctx->pdev); + ucfg_dlm_dump_deny_list_ap(hdd_ctx->pdev); vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_OSIF_CM_ID); if (!vdev) return -EINVAL; diff --git a/core/hdd/src/wlan_hdd_dcs.c b/core/hdd/src/wlan_hdd_dcs.c index 6378f7ea9f..7b1fcf4fda 100644 --- a/core/hdd/src/wlan_hdd_dcs.c +++ b/core/hdd/src/wlan_hdd_dcs.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. 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 above @@ -53,7 +54,7 @@ hdd_dcs_add_bssid_to_reject_list(struct wlan_objmgr_pdev *pdev, ap_info.reject_ap_type = DRIVER_RSSI_REJECT_TYPE; ap_info.reject_reason = REASON_STA_KICKOUT; ap_info.source = ADDED_BY_DRIVER; - return ucfg_blm_add_bssid_to_reject_list(pdev, &ap_info); + return ucfg_dlm_add_bssid_to_reject_list(pdev, &ap_info); } /** diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index c8094f4e5c..4041dcc5a1 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -394,7 +394,7 @@ static const struct category_info cinfo[MAX_SUPPORTED_CATEGORY] = { [QDF_MODULE_ID_CP_STATS] = {QDF_TRACE_LEVEL_ALL}, [QDF_MODULE_ID_DCS] = {QDF_TRACE_LEVEL_ALL}, [QDF_MODULE_ID_INTEROP_ISSUES_AP] = {QDF_TRACE_LEVEL_ALL}, - [QDF_MODULE_ID_BLACKLIST_MGR] = {QDF_TRACE_LEVEL_ALL}, + [QDF_MODULE_ID_DENYLIST_MGR] = {QDF_TRACE_LEVEL_ALL}, [QDF_MODULE_ID_DIRECT_BUF_RX] = {QDF_TRACE_LEVEL_ALL}, [QDF_MODULE_ID_SPECTRAL] = {QDF_TRACE_LEVEL_ALL}, [QDF_MODULE_ID_WIFIPOS] = {QDF_TRACE_LEVEL_ALL}, @@ -17029,7 +17029,7 @@ static void __hdd_inform_wifi_off(void) if (ret != 0) return; - ucfg_blm_wifi_off(hdd_ctx->pdev); + ucfg_dlm_wifi_off(hdd_ctx->pdev); } static void hdd_inform_wifi_off(void) @@ -17358,13 +17358,13 @@ static QDF_STATUS hdd_component_init(void) if (QDF_IS_STATUS_ERROR(status)) goto policy_deinit; - status = ucfg_blm_init(); + status = ucfg_dlm_init(); if (QDF_IS_STATUS_ERROR(status)) goto tdls_deinit; status = ucfg_pkt_capture_init(); if (QDF_IS_STATUS_ERROR(status)) - goto blm_deinit; + goto dlm_deinit; status = ucfg_ftm_time_sync_init(); if (QDF_IS_STATUS_ERROR(status)) @@ -17374,8 +17374,8 @@ static QDF_STATUS hdd_component_init(void) pkt_capture_deinit: ucfg_pkt_capture_deinit(); -blm_deinit: - ucfg_blm_deinit(); +dlm_deinit: + ucfg_dlm_deinit(); tdls_deinit: ucfg_tdls_deinit(); policy_deinit: @@ -17420,7 +17420,7 @@ static void hdd_component_deinit(void) /* deinitialize non-converged components */ ucfg_ftm_time_sync_deinit(); ucfg_pkt_capture_deinit(); - ucfg_blm_deinit(); + ucfg_dlm_deinit(); ucfg_tdls_deinit(); policy_mgr_deinit(); ucfg_interop_issues_ap_deinit(); @@ -17448,9 +17448,9 @@ QDF_STATUS hdd_component_psoc_open(struct wlan_objmgr_psoc *psoc) if (QDF_IS_STATUS_ERROR(status)) return status; - status = ucfg_blm_psoc_open(psoc); + status = ucfg_dlm_psoc_open(psoc); if (QDF_IS_STATUS_ERROR(status)) - goto err_blm; + goto err_dlm; status = ucfg_fwol_psoc_open(psoc); if (QDF_IS_STATUS_ERROR(status)) @@ -17489,8 +17489,8 @@ err_plcy_mgr: err_pmo: ucfg_fwol_psoc_close(psoc); err_fwol: - ucfg_blm_psoc_close(psoc); -err_blm: + ucfg_dlm_psoc_close(psoc); +err_dlm: ucfg_mlme_psoc_close(psoc); return status; @@ -17503,7 +17503,7 @@ void hdd_component_psoc_close(struct wlan_objmgr_psoc *psoc) ucfg_policy_mgr_psoc_close(psoc); ucfg_pmo_psoc_close(psoc); ucfg_fwol_psoc_close(psoc); - ucfg_blm_psoc_close(psoc); + ucfg_dlm_psoc_close(psoc); ucfg_mlme_psoc_close(psoc); } diff --git a/core/hdd/src/wlan_hdd_nud_tracking.c b/core/hdd/src/wlan_hdd_nud_tracking.c index 89654feb28..cd6ec158ad 100644 --- a/core/hdd/src/wlan_hdd_nud_tracking.c +++ b/core/hdd/src/wlan_hdd_nud_tracking.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. 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 @@ -253,7 +254,7 @@ hdd_handle_nud_fail_sta(struct hdd_context *hdd_ctx, ap_info.reject_ap_type = DRIVER_AVOID_TYPE; ap_info.reject_reason = REASON_NUD_FAILURE; ap_info.source = ADDED_BY_DRIVER; - ucfg_blm_add_bssid_to_reject_list(hdd_ctx->pdev, &ap_info); + ucfg_dlm_add_bssid_to_reject_list(hdd_ctx->pdev, &ap_info); if (roaming_offload_enabled(hdd_ctx)) { qdf_zero_macaddr(&bssid); diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 7bc7aa33b5..34041ede05 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -5102,8 +5102,8 @@ struct sir_peer_set_rx_blocksize { * @retry_delay: Retry delay received during last rejection in ms * @ expected_rssi: RSSI at which STA can initate * @time_during_rejection: Timestamp during last rejection in millisec - * @reject_reason: reason to add the BSSID to BLM - * @source: Source of adding the BSSID to BLM + * @reject_reason: reason to add the BSSID to DLM + * @source: Source of adding the BSSID to DLM * @original_timeout: original timeout sent by the AP * @received_time: Timestamp when the AP was added to the Blacklist */ @@ -5113,8 +5113,8 @@ struct sir_rssi_disallow_lst { uint32_t retry_delay; int8_t expected_rssi; qdf_time_t time_during_rejection; - enum blm_reject_ap_reason reject_reason; - enum blm_reject_ap_source source; + enum dlm_reject_ap_reason reject_reason; + enum dlm_reject_ap_source source; uint32_t original_timeout; qdf_time_t received_time; }; diff --git a/core/mac/src/pe/lim/lim_link_monitoring_algo.c b/core/mac/src/pe/lim/lim_link_monitoring_algo.c index 7880fd0c91..40c506fa51 100644 --- a/core/mac/src/pe/lim/lim_link_monitoring_algo.c +++ b/core/mac/src/pe/lim/lim_link_monitoring_algo.c @@ -235,7 +235,7 @@ void lim_delete_sta_context(struct mac_context *mac_ctx, ap_info.reject_ap_type = DRIVER_AVOID_TYPE; ap_info.reject_reason = REASON_STA_KICKOUT; ap_info.source = ADDED_BY_DRIVER; - wlan_blm_add_bssid_to_reject_list(mac_ctx->pdev, + wlan_dlm_add_bssid_to_reject_list(mac_ctx->pdev, &ap_info); /* only break for STA role (non TDLS) */ 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 cfc302db7e..dab771e36b 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 @@ -1017,7 +1017,7 @@ lim_process_assoc_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info, 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) + - wlan_blm_get_rssi_blacklist_threshold(mac_ctx->pdev); + wlan_dlm_get_rssi_denylist_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 654e0b9f34..ed54646bb1 100644 --- a/core/mac/src/pe/lim/lim_process_disassoc_frame.c +++ b/core/mac/src/pe/lim/lim_process_disassoc_frame.c @@ -310,7 +310,7 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo, ap_info.retry_delay = 0; ap_info.expected_rssi = frame_rssi + - wlan_blm_get_rssi_blacklist_threshold(mac->pdev); + wlan_dlm_get_rssi_denylist_threshold(mac->pdev); qdf_mem_copy(ap_info.bssid.bytes, pHdr->sa, QDF_MAC_ADDR_SIZE); ap_info.reject_reason = REASON_ASSOC_REJECT_POOR_RSSI; ap_info.source = ADDED_BY_DRIVER; diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 4aef918156..5c6662b594 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -8674,7 +8674,7 @@ lim_add_bssid_to_reject_list(struct wlan_objmgr_pdev *pdev, ap_info.rssi_reject_params.received_time = entry->received_time; ap_info.rssi_reject_params.original_timeout = entry->original_timeout; /* Add this ap info to the rssi reject ap type in blacklist manager */ - wlan_blm_add_bssid_to_reject_list(pdev, &ap_info); + wlan_dlm_add_bssid_to_reject_list(pdev, &ap_info); } void lim_decrement_pending_mgmt_count(struct mac_context *mac_ctx)