diff --git a/Kbuild b/Kbuild index 98a2aa8d01..ae3d38645e 100644 --- a/Kbuild +++ b/Kbuild @@ -1579,10 +1579,10 @@ BLM_DIR := components/blacklist_mgr BLM_INC := -I$(WLAN_ROOT)/$(BLM_DIR)/core/inc \ -I$(WLAN_ROOT)/$(BLM_DIR)/dispatcher/inc 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 \ - $(BLM_DIR)/dispatcher/src/wlan_blm_tgt_api.o +BLM_OBJS := $(BLM_DIR)/core/src/wlan_dlm_main.o \ + $(BLM_DIR)/core/src/wlan_dlm_core.o \ + $(BLM_DIR)/dispatcher/src/wlan_dlm_ucfg_api.o \ + $(BLM_DIR)/dispatcher/src/wlan_dlm_tgt_api.o endif $(call add-wlan-objs,blm,$(BLM_OBJS)) @@ -1689,7 +1689,7 @@ endif 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 +CLD_TARGET_IF_OBJ += $(CLD_TARGET_IF_DIR)/blacklist_mgr/src/target_if_dlm.o endif ifeq ($(CONFIG_WLAN_FEATURE_ACTION_OUI), y) diff --git a/components/blacklist_mgr/core/inc/wlan_blm_core.h b/components/blacklist_mgr/core/inc/wlan_dlm_core.h similarity index 98% rename from components/blacklist_mgr/core/inc/wlan_blm_core.h rename to components/blacklist_mgr/core/inc/wlan_dlm_core.h index 11963d8322..d8483a9590 100644 --- a/components/blacklist_mgr/core/inc/wlan_blm_core.h +++ b/components/blacklist_mgr/core/inc/wlan_dlm_core.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2022 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 @@ -23,7 +23,7 @@ #ifndef _WLAN_DLM_CORE_H_ #define _WLAN_DLM_CORE_H_ -#include +#include #define DLM_IS_AP_AVOIDED_BY_USERSPACE(cur_node) \ (cur_node)->userspace_avoidlist diff --git a/components/blacklist_mgr/core/inc/wlan_blm_main.h b/components/blacklist_mgr/core/inc/wlan_dlm_main.h similarity index 98% rename from components/blacklist_mgr/core/inc/wlan_blm_main.h rename to components/blacklist_mgr/core/inc/wlan_dlm_main.h index bab7ad8938..91eb398a1d 100644 --- a/components/blacklist_mgr/core/inc/wlan_blm_main.h +++ b/components/blacklist_mgr/core/inc/wlan_dlm_main.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2022 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 @@ -26,7 +26,7 @@ #include #include #include -#include +#include #define dlm_fatal(params...)\ QDF_TRACE_FATAL(QDF_MODULE_ID_DENYLIST_MGR, params) diff --git a/components/blacklist_mgr/core/src/wlan_blm_core.c b/components/blacklist_mgr/core/src/wlan_dlm_core.c similarity index 98% rename from components/blacklist_mgr/core/src/wlan_blm_core.c rename to components/blacklist_mgr/core/src/wlan_dlm_core.c index a9222fca93..844819b5f6 100644 --- a/components/blacklist_mgr/core/src/wlan_blm_core.c +++ b/components/blacklist_mgr/core/src/wlan_dlm_core.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2022 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 @@ -21,11 +21,11 @@ */ #include -#include +#include #include #include #include -#include "wlan_blm_tgt_api.h" +#include "wlan_dlm_tgt_api.h" #include #define SECONDS_TO_MS(params) ((params) * 1000) @@ -841,13 +841,13 @@ void dlm_dump_denylist_bssid(struct wlan_objmgr_pdev *pdev) dlm_entry, &dlm_psoc_obj->dlm_cfg); - 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, - dlm_entry->rssi_reject_params.expected_rssi, - dlm_entry->reject_ap_reason, - dlm_entry->rssi_reject_params.source); + 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, + 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; } diff --git a/components/blacklist_mgr/core/src/wlan_blm_main.c b/components/blacklist_mgr/core/src/wlan_dlm_main.c similarity index 96% rename from components/blacklist_mgr/core/src/wlan_blm_main.c rename to components/blacklist_mgr/core/src/wlan_dlm_main.c index 88179ada36..75cf699c67 100644 --- a/components/blacklist_mgr/core/src/wlan_blm_main.c +++ b/components/blacklist_mgr/core/src/wlan_dlm_main.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2022 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 @@ -26,10 +26,10 @@ /* Include files */ -#include "target_if_blm.h" -#include +#include "target_if_dlm.h" +#include #include "cfg_ucfg_api.h" -#include +#include struct dlm_pdev_priv_obj * dlm_get_pdev_obj(struct wlan_objmgr_pdev *pdev) diff --git a/components/blacklist_mgr/dispatcher/inc/wlan_cfg_blm.h b/components/blacklist_mgr/dispatcher/inc/wlan_cfg_dlm.h similarity index 98% rename from components/blacklist_mgr/dispatcher/inc/wlan_cfg_blm.h rename to components/blacklist_mgr/dispatcher/inc/wlan_cfg_dlm.h index 4846fa15e2..9a7abaeaf6 100644 --- a/components/blacklist_mgr/dispatcher/inc/wlan_cfg_blm.h +++ b/components/blacklist_mgr/dispatcher/inc/wlan_cfg_dlm.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2022 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 diff --git a/components/blacklist_mgr/dispatcher/inc/wlan_blm_api.h b/components/blacklist_mgr/dispatcher/inc/wlan_dlm_api.h similarity index 96% rename from components/blacklist_mgr/dispatcher/inc/wlan_blm_api.h rename to components/blacklist_mgr/dispatcher/inc/wlan_dlm_api.h index 9296bb6067..dd173303b2 100644 --- a/components/blacklist_mgr/dispatcher/inc/wlan_blm_api.h +++ b/components/blacklist_mgr/dispatcher/inc/wlan_dlm_api.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2022 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 @@ -25,10 +25,10 @@ #include "qdf_types.h" #include "wlan_objmgr_pdev_obj.h" -#include +#include #ifdef FEATURE_DENYLIST_MGR -#include "wlan_blm_core.h" +#include "wlan_dlm_core.h" /** * wlan_dlm_add_bssid_to_reject_list() - Add BSSID to the specific reject list. diff --git a/components/blacklist_mgr/dispatcher/inc/wlan_blm_public_struct.h b/components/blacklist_mgr/dispatcher/inc/wlan_dlm_public_struct.h similarity index 98% rename from components/blacklist_mgr/dispatcher/inc/wlan_blm_public_struct.h rename to components/blacklist_mgr/dispatcher/inc/wlan_dlm_public_struct.h index ba528a653b..50e64e3b20 100644 --- a/components/blacklist_mgr/dispatcher/inc/wlan_blm_public_struct.h +++ b/components/blacklist_mgr/dispatcher/inc/wlan_dlm_public_struct.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2022 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 diff --git a/components/blacklist_mgr/dispatcher/inc/wlan_blm_tgt_api.h b/components/blacklist_mgr/dispatcher/inc/wlan_dlm_tgt_api.h similarity index 92% rename from components/blacklist_mgr/dispatcher/inc/wlan_blm_tgt_api.h rename to components/blacklist_mgr/dispatcher/inc/wlan_dlm_tgt_api.h index 54cf939f84..234c7f79a9 100644 --- a/components/blacklist_mgr/dispatcher/inc/wlan_blm_tgt_api.h +++ b/components/blacklist_mgr/dispatcher/inc/wlan_dlm_tgt_api.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2019 The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2022 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 @@ -23,7 +23,7 @@ #ifndef _WLAN_DLM_TGT_API_H #define _WLAN_DLM_TGT_API_H -#include "wlan_blm_main.h" +#include "wlan_dlm_main.h" /** * tgt_dlm_send_reject_list_to_fw() - API to send the reject ap list to FW. diff --git a/components/blacklist_mgr/dispatcher/inc/wlan_blm_ucfg_api.h b/components/blacklist_mgr/dispatcher/inc/wlan_dlm_ucfg_api.h similarity index 98% rename from components/blacklist_mgr/dispatcher/inc/wlan_blm_ucfg_api.h rename to components/blacklist_mgr/dispatcher/inc/wlan_dlm_ucfg_api.h index 72d67b685c..e5ca4a3ca1 100644 --- a/components/blacklist_mgr/dispatcher/inc/wlan_blm_ucfg_api.h +++ b/components/blacklist_mgr/dispatcher/inc/wlan_dlm_ucfg_api.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2022 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 @@ -25,7 +25,7 @@ #include "qdf_types.h" #include "wlan_objmgr_psoc_obj.h" -#include +#include #ifdef FEATURE_DENYLIST_MGR diff --git a/components/blacklist_mgr/dispatcher/src/wlan_blm_tgt_api.c b/components/blacklist_mgr/dispatcher/src/wlan_dlm_tgt_api.c similarity index 93% rename from components/blacklist_mgr/dispatcher/src/wlan_blm_tgt_api.c rename to components/blacklist_mgr/dispatcher/src/wlan_dlm_tgt_api.c index e1a4947ca0..3e72423ef7 100644 --- a/components/blacklist_mgr/dispatcher/src/wlan_blm_tgt_api.c +++ b/components/blacklist_mgr/dispatcher/src/wlan_dlm_tgt_api.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2022 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 @@ -20,7 +20,7 @@ * DOC: Implements public API for denylist manager to interact with target/WMI */ -#include "wlan_blm_tgt_api.h" +#include "wlan_dlm_tgt_api.h" #if defined(WLAN_FEATURE_ROAM_OFFLOAD) QDF_STATUS diff --git a/components/blacklist_mgr/dispatcher/src/wlan_blm_ucfg_api.c b/components/blacklist_mgr/dispatcher/src/wlan_dlm_ucfg_api.c similarity index 97% rename from components/blacklist_mgr/dispatcher/src/wlan_blm_ucfg_api.c rename to components/blacklist_mgr/dispatcher/src/wlan_dlm_ucfg_api.c index ed2d4d1168..08e4dcfd80 100644 --- a/components/blacklist_mgr/dispatcher/src/wlan_blm_ucfg_api.c +++ b/components/blacklist_mgr/dispatcher/src/wlan_dlm_ucfg_api.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2022 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 @@ -20,9 +20,9 @@ * DOC: define UCFG APIs exposed by the denylist mgr component */ -#include -#include -#include +#include +#include +#include #include "wlan_pmo_obj_mgmt_api.h" QDF_STATUS ucfg_dlm_init(void) diff --git a/components/cfg/cfg_all.h b/components/cfg/cfg_all.h index 0d360b4bcb..b86b3fdb65 100644 --- a/components/cfg/cfg_all.h +++ b/components/cfg/cfg_all.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2022 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 @@ -48,7 +48,7 @@ #include "hdd_config.h" #include "hdd_dp_cfg.h" #include "cfg_legacy_dp.h" -#include "wlan_cfg_blm.h" +#include "wlan_cfg_dlm.h" #include "cfg_pkt_capture.h" /* Maintain Alphabetic order here while adding components */ diff --git a/components/fw_offload/dispatcher/inc/cfg_fwol.h b/components/fw_offload/dispatcher/inc/cfg_fwol.h index 789aa08288..001e700c7a 100644 --- a/components/fw_offload/dispatcher/inc/cfg_fwol.h +++ b/components/fw_offload/dispatcher/inc/cfg_fwol.h @@ -25,7 +25,7 @@ #include "qdf_types.h" #include "cfg_coex.h" #include "cfg_thermal_temp.h" -#include "cfg_ie_whitelist.h" +#include "cfg_ie_allowlist.h" #include "cfg_fwol_generic.h" #include "cfg_neighbor_roam.h" #include "cfg_adaptive_dwelltime.h" diff --git a/components/fw_offload/dispatcher/inc/cfg_ie_whitelist.h b/components/fw_offload/dispatcher/inc/cfg_ie_allowlist.h similarity index 99% rename from components/fw_offload/dispatcher/inc/cfg_ie_whitelist.h rename to components/fw_offload/dispatcher/inc/cfg_ie_allowlist.h index 11f043a4d0..40802231d8 100644 --- a/components/fw_offload/dispatcher/inc/cfg_ie_whitelist.h +++ b/components/fw_offload/dispatcher/inc/cfg_ie_allowlist.h @@ -21,8 +21,8 @@ * DOC: This file contains centralized definitions of converged configuration. */ -#ifndef __CFG_IE_WHITELIST_H -#define __CFG_IE_WHITELIST_H +#ifndef __CFG_IE_ALLOWLIST_H +#define __CFG_IE_ALLOWLIST_H /* * diff --git a/components/target_if/blacklist_mgr/inc/target_if_blm.h b/components/target_if/blacklist_mgr/inc/target_if_dlm.h similarity index 94% rename from components/target_if/blacklist_mgr/inc/target_if_blm.h rename to components/target_if/blacklist_mgr/inc/target_if_dlm.h index 1f038dde3b..d620ae65f3 100644 --- a/components/target_if/blacklist_mgr/inc/target_if_blm.h +++ b/components/target_if/blacklist_mgr/inc/target_if_dlm.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2022 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 @@ -25,7 +25,7 @@ #ifndef __TARGET_IF_DLM_H #define __TARGET_IF_DLM_H -#include "wlan_blm_public_struct.h" +#include "wlan_dlm_public_struct.h" #if defined(WLAN_FEATURE_ROAM_OFFLOAD) /** diff --git a/components/target_if/blacklist_mgr/src/target_if_blm.c b/components/target_if/blacklist_mgr/src/target_if_dlm.c similarity index 93% rename from components/target_if/blacklist_mgr/src/target_if_blm.c rename to components/target_if/blacklist_mgr/src/target_if_dlm.c index c0606e8cf1..79de674e64 100644 --- a/components/target_if/blacklist_mgr/src/target_if_blm.c +++ b/components/target_if/blacklist_mgr/src/target_if_dlm.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2022 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 @@ -22,7 +22,7 @@ * in target if internally. */ -#include +#include #include "target_if.h" #if defined(WLAN_FEATURE_ROAM_OFFLOAD) 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 1a6c29d781..80dd80bd70 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 @@ -27,7 +27,7 @@ #include "wlan_objmgr_pdev_obj.h" #include "wlan_objmgr_vdev_obj.h" #include "wlan_cm_roam_i.h" -#include "wlan_blm_api.h" +#include "wlan_dlm_api.h" #include "wlan_cm_roam_public_struct.h" #include "wlan_utility.h" #include "wlan_scan_api.h" 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 8e03910fde..1c90e3e248 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 @@ -31,7 +31,7 @@ #include "wlan_crypto_global_api.h" #include "wlan_psoc_mlme_api.h" #include "pld_common.h" -#include "wlan_blm_api.h" +#include "wlan_dlm_api.h" #include "wlan_scan_api.h" #include "wlan_vdev_mgr_ucfg_api.h" #include "wlan_p2p_cfg_api.h" 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 f0da46724f..be837ccf08 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 @@ -25,7 +25,7 @@ #include "wlan_objmgr_cmn.h" #include "reg_services_public_struct.h" #include "wlan_cm_bss_score_param.h" -#include "wlan_blm_public_struct.h" +#include "wlan_dlm_public_struct.h" #include "wmi_unified_param.h" #include "wmi_unified_sta_param.h" #include "wlan_cm_public_struct.h" 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 160842ea7f..fc5365f454 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 @@ -31,7 +31,7 @@ #include #include "connection_mgr/core/src/wlan_cm_roam.h" #include "wlan_cm_roam_api.h" -#include "wlan_blm_api.h" +#include "wlan_dlm_api.h" #include <../../core/src/wlan_cm_roam_i.h> #include "wlan_reg_ucfg_api.h" diff --git a/components/wmi/inc/wmi_unified_roam_param.h b/components/wmi/inc/wmi_unified_roam_param.h index 566d8f90a8..b4d86d37fc 100644 --- a/components/wmi/inc/wmi_unified_roam_param.h +++ b/components/wmi/inc/wmi_unified_roam_param.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2013-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2021-2022 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 @@ -21,7 +22,7 @@ #ifndef _WMI_UNIFIED_ROAM_PARAM_H_ #define _WMI_UNIFIED_ROAM_PARAM_H_ -#include +#include #include /** diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 62354cdd66..72e11ce2bc 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -71,7 +71,7 @@ #include "wlan_hdd_nud_tracking.h" #include #include -#include "wlan_blm_ucfg_api.h" +#include "wlan_dlm_ucfg_api.h" #include "wlan_hdd_sta_info.h" #include "wlan_hdd_ftm_time_sync.h" #include "wlan_hdd_periodic_sta_stats.h" diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index d2d524d887..7f8d233350 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -145,7 +145,7 @@ #include "wlan_hdd_coex_config.h" #include "wlan_hdd_bcn_recv.h" #include "wlan_hdd_connectivity_logging.h" -#include "wlan_blm_ucfg_api.h" +#include "wlan_dlm_ucfg_api.h" #include "wlan_hdd_hw_capability.h" #include "wlan_hdd_oemdata.h" #include "os_if_fwol.h" diff --git a/core/hdd/src/wlan_hdd_cm_connect.c b/core/hdd/src/wlan_hdd_cm_connect.c index 46cba9a82c..8951b0cf4c 100644 --- a/core/hdd/src/wlan_hdd_cm_connect.c +++ b/core/hdd/src/wlan_hdd_cm_connect.c @@ -42,7 +42,7 @@ #include "wlan_vdev_mgr_ucfg_api.h" #include "wlan_hdd_bootup_marker.h" #include "sme_qos_internal.h" -#include "wlan_blm_ucfg_api.h" +#include "wlan_dlm_ucfg_api.h" #include "wlan_hdd_scan.h" #include "wlan_osif_priv.h" #include diff --git a/core/hdd/src/wlan_hdd_dcs.c b/core/hdd/src/wlan_hdd_dcs.c index 7b1fcf4fda..d76f299607 100644 --- a/core/hdd/src/wlan_hdd_dcs.c +++ b/core/hdd/src/wlan_hdd_dcs.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2022 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 @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 75e2d3246f..49cf370742 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -182,7 +182,7 @@ #include #include #include -#include "wlan_blm_ucfg_api.h" +#include "wlan_dlm_ucfg_api.h" #include "ftm_time_sync_ucfg_api.h" #include "ol_txrx.h" #include "wlan_hdd_sta_info.h" diff --git a/core/hdd/src/wlan_hdd_nud_tracking.c b/core/hdd/src/wlan_hdd_nud_tracking.c index cd6ec158ad..921f8c2be6 100644 --- a/core/hdd/src/wlan_hdd_nud_tracking.c +++ b/core/hdd/src/wlan_hdd_nud_tracking.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2022 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 @@ -23,7 +23,7 @@ #include "osif_sync.h" #include "wlan_hdd_main.h" -#include "wlan_blm_ucfg_api.h" +#include "wlan_dlm_ucfg_api.h" #include "hdd_dp_cfg.h" #include #include "wlan_cm_roam_ucfg_api.h" 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 40c506fa51..b6dbd41bad 100644 --- a/core/mac/src/pe/lim/lim_link_monitoring_algo.c +++ b/core/mac/src/pe/lim/lim_link_monitoring_algo.c @@ -45,7 +45,7 @@ #include "lim_ft_defs.h" #include "lim_session.h" #include "lim_ser_des_utils.h" -#include "wlan_blm_api.h" +#include "wlan_dlm_api.h" /** * lim_delete_sta_util - utility function for deleting station context 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 5e63c42bff..64a15273d2 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 @@ -42,7 +42,7 @@ #include "lim_ser_des_utils.h" #include "lim_send_messages.h" #include "lim_process_fils.h" -#include "wlan_blm_api.h" +#include "wlan_dlm_api.h" #include "wlan_mlme_twt_api.h" #include "wlan_mlme_ucfg_api.h" #include "wlan_connectivity_logging.h" 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 ed54646bb1..14bf224c88 100644 --- a/core/mac/src/pe/lim/lim_process_disassoc_frame.c +++ b/core/mac/src/pe/lim/lim_process_disassoc_frame.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2022 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 @@ -42,7 +42,7 @@ #include "lim_ser_des_utils.h" #include "lim_send_messages.h" #include "sch_api.h" -#include "wlan_blm_api.h" +#include "wlan_dlm_api.h" #include "wlan_connectivity_logging.h" /** diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 40e005540c..218f18035f 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -66,7 +66,7 @@ #include "qdf_util.h" #include "wlan_qct_sys.h" #include -#include +#include #include #include "wlan_mlme_ucfg_api.h" #include "nan_ucfg_api.h" diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 9dbaed644f..02a017c02c 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -63,7 +63,7 @@ #include "wlan_mlme_public_struct.h" #include #include "wlan_qct_sys.h" -#include "wlan_blm_api.h" +#include "wlan_dlm_api.h" #include "wlan_policy_mgr_i.h" #include "wlan_scan_utils_api.h" #include "wlan_p2p_cfg_api.h" diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index 2e7da6cd96..671e21ac13 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -50,7 +50,7 @@ #include #include "wlan_reg_services_api.h" #include "sch_api.h" -#include "wlan_blm_api.h" +#include "wlan_dlm_api.h" #include "qdf_crypto.h" #include #include "wlan_reg_ucfg_api.h" diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 5a37e273ca..652aab6ee9 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -44,7 +44,7 @@ #include "lim_session_utils.h" #include "cds_utils.h" -#include "wlan_blm_api.h" +#include "wlan_dlm_api.h" #if !defined(REMOVE_PKT_LOG) #include "pktlog_ac.h" #else diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 42695a1bb8..99444a7615 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -41,7 +41,7 @@ #include "qdf_nbuf.h" #include "qdf_types.h" #include "qdf_mem.h" -#include "wlan_blm_api.h" +#include "wlan_dlm_api.h" #include "wma_types.h" #include "lim_api.h" @@ -82,7 +82,7 @@ #include #include #include -#include "wlan_blm_api.h" +#include "wlan_dlm_api.h" #include "wlan_cm_roam_api.h" #ifdef FEATURE_WLAN_DIAG_SUPPORT /* FEATURE_WLAN_DIAG_SUPPORT */ #include "host_diag_core_log.h"