A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-25 22:23:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Update caller APIs of get power type for 6G API

Browse source 
Update the caller functions of wlan_reg_get_6g_power_type_for_ctry
to include AP's power type as a factor along with existing ctry
codes to determine STA's power type for 6G.

Change-Id: I8e1c54a5e760b173532fc001790fb76c70120c54
CRs-Fixed: 3087093
This commit is contained in:
Gururaj Pandurangi 2021-12-02 03:59:19 -08:00 • committed by Madan Koyyalamudi
commit 90fe84b4f9
4 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
core/mac/src/pe/lim/lim_prop_exts_utils.c
View file

@ -1,5 +1,6 @@
/*
* Copyright (c) 2011-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 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
@ -129,9 +130,9 @@ static void lim_extract_he_op(struct pe_session *session,
session->he_op.oper_info_6g.info.center_freq_seg1;
session->ap_power_type =
session->he_op.oper_info_6g.info.reg_info;
pe_debug("6G op info: ch_wd %d cntr_freq_seg0 %d cntr_freq_seg1 %d",
pe_debug("6G op info: ch_wd %d cntr_freq_seg0 %d cntr_freq_seg1 %d ap pwr type %d",
session->ch_width, session->ch_center_freq_seg0,
session->ch_center_freq_seg1);
session->ch_center_freq_seg1, session->ap_power_type);
if (!session->ch_center_freq_seg1)
return;
@ -466,11 +467,18 @@ void lim_extract_ap_capability(struct mac_context *mac_ctx, uint8_t *p_ie,
tDot11fIEVHTCaps *vht_caps;
uint8_t channel = 0;
struct mlme_vht_capabilities_info *mlme_vht_cap;
uint8_t session_id;
beacon_struct = qdf_mem_malloc(sizeof(tSirProbeRespBeacon));
if (!beacon_struct)
return;
session_id = session->smeSessionId;
if (session_id >= WLAN_MAX_VDEVS) {
pe_err("Invalid session_id %d", session_id);
return;
}
*qos_cap = 0;
*uapsd = 0;
pe_debug("The IE's being received:");
@ -698,6 +706,9 @@ void lim_extract_ap_capability(struct mac_context *mac_ctx, uint8_t *p_ie,
}
}
mac_ctx->roam.roamSession[session_id].ap_power_type =
session->ap_power_type;
get_ese_version_ie_probe_response(mac_ctx, beacon_struct, session);
session->country_info_present = false;

2
core/mac/src/pe/sch/sch_beacon_process.c
View file

@ -764,7 +764,7 @@ static void __sch_beacon_process_for_session(struct mac_context *mac_ctx,
status = wlan_reg_get_6g_power_type_for_ctry(mac_ctx->psoc,
bcn->countryInfoParam.countryString,
programmed_country, &pwr_type_6g,
&ctry_code_match);
&ctry_code_match, REG_MAX_AP_TYPE);
if (QDF_IS_STATUS_ERROR(status))
return;
}

3
core/sme/inc/csr_internal.h
View file

@ -1,5 +1,6 @@
/*
* Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 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
@ -620,6 +621,8 @@ struct csr_roam_session {
qdf_mc_timer_t roam_invoke_timer;
struct csr_timer_info roam_invoke_timer_info;
#endif
/* AP power type */
uint8_t ap_power_type;
};
struct csr_roamstruct {

5
core/sme/src/csr/csr_api_roam.c
View file

@ -15799,10 +15799,11 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId,
sme_debug("Channel is 6G but country IE not present");
wlan_reg_read_current_country(mac->psoc,
programmed_country);
status = wlan_reg_get_6g_power_type_for_ctry(
status = wlan_reg_get_6g_power_type_for_ctry(mac->psoc,
pIes->Country.country,
programmed_country, &power_type_6g,
&ctry_code_match);
&ctry_code_match,
pSession->ap_power_type);
if (QDF_IS_STATUS_ERROR(status))
break;
csr_join_req->ap_power_type_6g = power_type_6g;