wifi: ieee80211/ath11k: remove IEEE80211_MAX_NUM_PWR_LEVEL

The define IEEE80211_MAX_NUM_PWR_LEVEL doesn't make much
sense. Yes, that table has a maximum value of 8, and the
table will actually remain that way, but EHT introduced
a way to encode more levels for 320 MHz channels.

Remove IEEE80211_MAX_NUM_PWR_LEVEL and, for ath11k being
the only user, add ATH11K_NUM_PWR_LEVELS, where it makes
sense since it cannot support 320 MHz channels.

Acked-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20240506214536.9818e5471055.Icece7e47e963d6b68e0d97ba13c102b37fbaa689@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h
index 205f40ee6b666eca73ec351571245150618db4f4..df24f0e409afb1b17345c14a29f5b7c24edd45c8 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/core.h
+++ b/drivers/net/wireless/ath/ath11k/core.h
@@ -330,6 +330,9 @@ struct ath11k_chan_power_info {
        s8 tx_power;
 };
 
+/* ath11k only deals with 160 MHz, so 8 subchannels */
+#define ATH11K_NUM_PWR_LEVELS  8
+
 /**
  * struct ath11k_reg_tpc_power_info - regulatory TPC power info
  * @is_psd_power: is PSD power or not
@@ -346,10 +349,10 @@ struct ath11k_reg_tpc_power_info {
        u8 eirp_power;
        enum wmi_reg_6ghz_ap_type ap_power_type;
        u8 num_pwr_levels;
-       u8 reg_max[IEEE80211_MAX_NUM_PWR_LEVEL];
+       u8 reg_max[ATH11K_NUM_PWR_LEVELS];
        u8 ap_constraint_power;
-       s8 tpe[IEEE80211_MAX_NUM_PWR_LEVEL];
-       struct ath11k_chan_power_info chan_power_info[IEEE80211_MAX_NUM_PWR_LEVEL];
+       s8 tpe[ATH11K_NUM_PWR_LEVELS];
+       struct ath11k_chan_power_info chan_power_info[ATH11K_NUM_PWR_LEVELS];
 };
 
 struct ath11k_vif {

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 4f62e38ba48b3a144ba658ce11f4c8193024d89a..59e5e80857422e3e592b252f47e6218c25eb2482 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -7688,7 +7688,7 @@ void ath11k_mac_fill_reg_tpc_info(struct ath11k *ar,
        struct ieee80211_channel *chan, *temp_chan;
        u8 pwr_lvl_idx, num_pwr_levels, pwr_reduction;
        bool is_psd_power = false, is_tpe_present = false;
-       s8 max_tx_power[IEEE80211_MAX_NUM_PWR_LEVEL],
+       s8 max_tx_power[ATH11K_NUM_PWR_LEVELS],
                psd_power, tx_power;
        s8 eirp_power = 0;
        u16 start_freq, center_freq;

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index fb50a99daa93e1b0538758069ff8f95731dc9a1e..1c3a683a3ee22374e41445857cda39d79cde27a5 100644 (file)
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -2833,11 +2833,6 @@ struct ieee80211_he_6ghz_oper {
  * So it it totally max 8 Transmit Power Envelope element.
  */
 #define IEEE80211_TPE_MAX_IE_COUNT     8
-/*
- * In "Table 9-277—Meaning of Maximum Transmit Power Count subfield"
- * of "IEEE Std 802.11ax™‐2021", the max power level is 8.
- */
-#define IEEE80211_MAX_NUM_PWR_LEVEL    8
 
 #define IEEE80211_TPE_MAX_POWER_COUNT  8