mac80211: parse transmit power envelope element

Parse and store the transmit power envelope element.

Signed-off-by: Wen Gong <wgong@codeaurora.org>
Link: https://lore.kernel.org/r/20210820122041.12157-8-wgong@codeaurora.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 4d830a9c7b18b8b28f59f4e3d2835d43345db599..159af6c3ffb05b84e49a38e6946286bcc4df1a3c 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1534,6 +1534,7 @@ struct ieee802_11_elems {
        const struct ieee80211_he_spr *he_spr;
        const struct ieee80211_mu_edca_param_set *mu_edca_param_set;
        const struct ieee80211_he_6ghz_capa *he_6ghz_capa;
+       const struct ieee80211_tx_pwr_env *tx_pwr_env[IEEE80211_TPE_MAX_IE_COUNT];
        const u8 *uora_element;
        const u8 *mesh_id;
        const u8 *peering;
@@ -1584,6 +1585,8 @@ struct ieee802_11_elems {
        u8 perr_len;
        u8 country_elem_len;
        u8 bssid_index_len;
+       u8 tx_pwr_env_len[IEEE80211_TPE_MAX_IE_COUNT];
+       u8 tx_pwr_env_num;
 
        /* whether a parse error occurred while retrieving these elements */
        bool parse_error;

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 05e96212b1042df96b3ca773cfb9cf88d6b42e60..49cb96d251695a7d8de833fdd47635ab6e25b18c 100644 (file)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1336,6 +1336,18 @@ _ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action,
                        elems->rsnx = pos;
                        elems->rsnx_len = elen;
                        break;
+               case WLAN_EID_TX_POWER_ENVELOPE:
+                       if (elen < 1 ||
+                           elen > sizeof(struct ieee80211_tx_pwr_env))
+                               break;
+
+                       if (elems->tx_pwr_env_num >= ARRAY_SIZE(elems->tx_pwr_env))
+                               break;
+
+                       elems->tx_pwr_env[elems->tx_pwr_env_num] = (void *)pos;
+                       elems->tx_pwr_env_len[elems->tx_pwr_env_num] = elen;
+                       elems->tx_pwr_env_num++;
+                       break;
                case WLAN_EID_EXTENSION:
                        ieee80211_parse_extension_element(calc_crc ?
                                                                &crc : NULL,