diff --git a/drivers/staging/qca-wifi-host-cmn/umac/regulatory/core/src/reg_utils.c b/drivers/staging/qca-wifi-host-cmn/umac/regulatory/core/src/reg_utils.c index 73f3a88c7806..2a162c13bd52 100644 --- a/drivers/staging/qca-wifi-host-cmn/umac/regulatory/core/src/reg_utils.c +++ b/drivers/staging/qca-wifi-host-cmn/umac/regulatory/core/src/reg_utils.c @@ -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; diff --git a/drivers/staging/qca-wifi-host-cmn/umac/regulatory/dispatcher/inc/reg_services_public_struct.h b/drivers/staging/qca-wifi-host-cmn/umac/regulatory/dispatcher/inc/reg_services_public_struct.h index 46b1e668709b..b8e63e6574e6 100644 --- a/drivers/staging/qca-wifi-host-cmn/umac/regulatory/dispatcher/inc/reg_services_public_struct.h +++ b/drivers/staging/qca-wifi-host-cmn/umac/regulatory/dispatcher/inc/reg_services_public_struct.h @@ -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