浏览代码

qcacld-3.0: Rename policy_mgr_is_ll_sap_present() properly

Rename policy_mgr_is_ll_sap_present() into
policy_mgr_is_vdev_ll_sap(). As this api mainly checks
whether the given vdev is ll sap or not

Change-Id: I7f87aceeb0ed6ac5bb7014db1fd6213e62e6305e
CRs-Fixed: 3413644
Jyoti Kumari 2 年之前
父节点
当前提交
d749270732

+ 4 - 4
components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h

@@ -1614,7 +1614,7 @@ policy_mgr_get_pcl_channel_for_ll_sap_concurrency(
 					uint8_t *pcl_weight, uint32_t *len);
 
 /**
- * policy_mgr_is_ll_sap_present() - Check whether LL SAP is present or not
+ * policy_mgr_is_vdev_ll_sap() - Check whether given vdev is LL SAP or not
  * @psoc: psoc object
  * @mode: device mode
  * @vdev_id: vdev id
@@ -1622,9 +1622,9 @@ policy_mgr_get_pcl_channel_for_ll_sap_concurrency(
  * Return: true if it's present otherwise false
  */
 bool
-policy_mgr_is_ll_sap_present(struct wlan_objmgr_psoc *psoc,
-			     enum policy_mgr_con_mode mode,
-			     uint32_t vdev_id);
+policy_mgr_is_vdev_ll_sap(struct wlan_objmgr_psoc *psoc,
+			  enum policy_mgr_con_mode mode,
+			  uint32_t vdev_id);
 
 /**
  * policy_mgr_get_preferred_dbs_action_table() - get dbs action table type

+ 5 - 5
components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c

@@ -4087,9 +4087,9 @@ bool policy_mgr_is_sta_chan_valid_for_connect_and_roam(
 }
 
 bool
-policy_mgr_is_ll_sap_present(struct wlan_objmgr_psoc *psoc,
-			     enum policy_mgr_con_mode curr_mode,
-			     uint32_t vdev_id)
+policy_mgr_is_vdev_ll_sap(struct wlan_objmgr_psoc *psoc,
+			  enum policy_mgr_con_mode curr_mode,
+			  uint32_t vdev_id)
 {
 	struct wlan_objmgr_vdev *vdev;
 	bool is_ll_sap = false;
@@ -4208,7 +4208,7 @@ policy_mgr_get_pcl_ch_for_sap_go_with_ll_sap_present(
 		freq = pm_conc_connection_list[conn_idx].freq;
 		vdev_id = pm_conc_connection_list[conn_idx].vdev_id;
 		mode = pm_conc_connection_list[conn_idx].mode;
-		if (!policy_mgr_is_ll_sap_present(psoc, mode, vdev_id))
+		if (!policy_mgr_is_vdev_ll_sap(psoc, mode, vdev_id))
 			continue;
 
 		is_ll_sap = 1;
@@ -4249,7 +4249,7 @@ policy_mgr_get_pcl_channel_for_ll_sap_concurrency(
 {
 	uint32_t orig_len = *len;
 
-	if (policy_mgr_is_ll_sap_present(psoc, curr_mode, vdev_id)) {
+	if (policy_mgr_is_vdev_ll_sap(psoc, curr_mode, vdev_id)) {
 		/* Scenario: If there is some existing interface present and
 		 * LL SAP is coming up.
 		 * Filter pcl channel for LL SAP

+ 3 - 3
core/hdd/src/wlan_hdd_cfg80211.c

@@ -3575,7 +3575,7 @@ static void hdd_remove_passive_dfs_acs_channel_for_ll_sap(
 	uint32_t i, ch_cnt = 0;
 	uint32_t freq = 0;
 
-	if (!policy_mgr_is_ll_sap_present(psoc, curr_mode, vdev_id))
+	if (!policy_mgr_is_vdev_ll_sap(psoc, curr_mode, vdev_id))
 		return;
 
 	for (i = 0; i < sap_config->acs_cfg.ch_list_count; i++) {
@@ -3901,8 +3901,8 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 		if (!sap_config->acs_cfg.ch_list_count &&
 		    sap_config->acs_cfg.master_ch_list_count &&
 		    !is_vendor_unsafe_ch_present &&
-		    !policy_mgr_is_ll_sap_present(hdd_ctx->psoc, pm_mode,
-						  adapter->vdev_id))
+		    !policy_mgr_is_vdev_ll_sap(hdd_ctx->psoc, pm_mode,
+					       adapter->vdev_id))
 			wlan_hdd_handle_zero_acs_list(
 				hdd_ctx,
 				sap_config->acs_cfg.freq_list,

+ 2 - 2
core/mac/src/pe/sch/sch_message.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 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
@@ -536,7 +536,7 @@ void sch_edca_profile_update(struct mac_context *mac, struct pe_session *pe_sess
 		sch_qos_update_broadcast(mac, pe_session);
 		sch_qos_concurrency_update();
 
-		if (policy_mgr_is_ll_sap_present(
+		if (policy_mgr_is_vdev_ll_sap(
 				mac->psoc,
 				policy_mgr_convert_device_mode_to_qdf_type(
 				pe_session->opmode), pe_session->vdev_id))

+ 1 - 1
core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -1752,7 +1752,7 @@ void populate_dot11f_qcn_ie(struct mac_context *mac,
 	}
 
 	populate_dot11f_qcn_ie_he_params(mac, pe_session, qcn_ie, attr_id);
-	if (policy_mgr_is_ll_sap_present(
+	if (policy_mgr_is_vdev_ll_sap(
 				mac->psoc,
 				policy_mgr_convert_device_mode_to_qdf_type(
 				pe_session->opmode), pe_session->vdev_id)) {

+ 2 - 2
core/sme/src/csr/csr_util.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023 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
@@ -619,7 +619,7 @@ uint16_t csr_check_concurrent_channel_overlap(struct mac_context *mac_ctx,
 		return 0;
 
 	op_mode = wlan_get_opmode_vdev_id(mac_ctx->pdev, vdev_id);
-	if (policy_mgr_is_ll_sap_present(
+	if (policy_mgr_is_vdev_ll_sap(
 			mac_ctx->psoc,
 			policy_mgr_convert_device_mode_to_qdf_type(op_mode),
 			vdev_id))