Merge tag 'LA.UM.9.14.1.r1-10900-QCM6490.QSSI14.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn into android13-5.4-lahaina

"LA.UM.9.14.1.r1-10900-QCM6490.QSSI14.0"

* tag 'LA.UM.9.14.1.r1-10900-QCM6490.QSSI14.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn:
  qcacmn: Fix low TPC power for vendor DTPC IE
  qcacmn: set pdev id to 0xFF when set country code
  qcacmn: Update preauth candidate entry to scan table
  qcacmn: Dont add the wmi header size while allocating the wmi buff
  qcacmn: Reduce the log level from error to info
  qcacmn: add vendor command to configure the parameters for monitor mode
  Revert "qcacmn: add vendor command to configure the parameters for monitor mode"
  qcacmn: Add cdp api to update the packet capture mode
  qcacmn: add vendor command to configure the parameters for monitor mode
  qcacmn: Add APIs to get data packets info
  qcacmn: Drop non-eapol packets for unauthorized peer
  qcacmn: Fix possible OOB in wmi_extract_dbr_buf_release_entry
  Revert "qcacmn: add wmi service for tx aggregation support"
  qcacmn: add wmi service for tx aggregation support

Change-Id: I1bc6d399f20e906c9366e0a816952cb5dfe865b6
This commit is contained in:
Michael Bestas 2023-08-29 03:56:09 +03:00
commit b326ec1ff9
No known key found for this signature in database
GPG key ID: CC95044519BE6669
2 changed files with 12 additions and 4 deletions

View file

@ -1,6 +1,6 @@
/*
* Copyright (c) 2014-2020 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
@ -38,6 +38,7 @@
#include "reg_services_common.h"
#include "reg_build_chan_list.h"
#include "wlan_cm_bss_score_param.h"
#include "wmi_unified_param.h"
#define DEFAULT_WORLD_REGDMN 0x60
@ -228,7 +229,11 @@ QDF_STATUS reg_set_country(struct wlan_objmgr_pdev *pdev,
reg_debug("programming new country: %s to firmware", country);
qdf_mem_copy(cc.country, country, REG_ALPHA2_LEN + 1);
cc.pdev_id = pdev_id;
/*
* Need firmware to send channel list event
* for all phys. Therefore set pdev_id to 0xFF.
*/
cc.pdev_id = WMI_HOST_PDEV_ID_SOC;
if (!psoc_reg->offload_enabled && !reg_is_world_alpha2(country)) {
QDF_STATUS status;
@ -1084,9 +1089,9 @@ QDF_STATUS reg_set_curr_country(struct wlan_regulatory_psoc_priv_obj *soc_reg,
/*
* Need firmware to send channel list event
* for all phys. Therefore set pdev_id to 0xFF
* for all phys. Therefore set pdev_id to 0xFF.
*/
pdev_id = 0xFF;
pdev_id = WMI_HOST_PDEV_ID_SOC;
for (phy_num = 0; phy_num < regulat_info->num_phy; phy_num++) {
if (soc_reg->cc_src == SOURCE_USERSPACE)
soc_reg->new_user_ctry_pending[phy_num] = true;

View file

@ -1,5 +1,6 @@
/*
* Copyright (c) 2017-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 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
@ -1430,6 +1431,7 @@ struct chan_power_info {
* @frequency: Array of operating frequency
* @tpe: TPE values processed from TPE IE
* @chan_power_info: power info to send to FW
* @is_power_constraint_abs: is power constraint absolute or not
*/
struct reg_tpc_power_info {
bool is_psd_power;
@ -1441,6 +1443,7 @@ struct reg_tpc_power_info {
qdf_freq_t frequency[MAX_NUM_PWR_LEVEL];
uint8_t tpe[MAX_NUM_PWR_LEVEL];
struct chan_power_info chan_power_info[MAX_NUM_PWR_LEVEL];
bool is_power_constraint_abs;
};
#endif