]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
mac80211: add parse regulatory info in 6 GHz operation information
authorWen Gong <wgong@codeaurora.org>
Fri, 24 Sep 2021 10:00:48 +0000 (06:00 -0400)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 27 Sep 2021 11:15:33 +0000 (13:15 +0200)
This patch is to convert the regulatory info subfield in HE operation
element to power type and save in struct cfg80211_chan_def.

Signed-off-by: Wen Gong <wgong@codeaurora.org>
Link: https://lore.kernel.org/r/20210924100052.32029-3-wgong@codeaurora.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/util.c

index ca8008ba9b1feada398f022b3e9a357e97070b7c..39fa2a50385d89131c065845ae5f6155cd5c7205 100644 (file)
@@ -3385,6 +3385,7 @@ bool ieee80211_chandef_he_6ghz_oper(struct ieee80211_sub_if_data *sdata,
        const struct ieee80211_sta_he_cap *he_cap;
        struct cfg80211_chan_def he_chandef = *chandef;
        const struct ieee80211_he_6ghz_oper *he_6ghz_oper;
+       struct ieee80211_bss_conf *bss_conf = &sdata->vif.bss_conf;
        bool support_80_80, support_160;
        u8 he_phy_cap;
        u32 freq;
@@ -3428,6 +3429,19 @@ bool ieee80211_chandef_he_6ghz_oper(struct ieee80211_sub_if_data *sdata,
                                              NL80211_BAND_6GHZ);
        he_chandef.chan = ieee80211_get_channel(sdata->local->hw.wiphy, freq);
 
+       switch (u8_get_bits(he_6ghz_oper->control,
+                           IEEE80211_HE_6GHZ_OPER_CTRL_REG_INFO)) {
+       case IEEE80211_6GHZ_CTRL_REG_LPI_AP:
+               bss_conf->power_type = IEEE80211_REG_LPI_AP;
+               break;
+       case IEEE80211_6GHZ_CTRL_REG_SP_AP:
+               bss_conf->power_type = IEEE80211_REG_SP_AP;
+               break;
+       default:
+               bss_conf->power_type = IEEE80211_REG_UNSET_AP;
+               break;
+       }
+
        switch (u8_get_bits(he_6ghz_oper->control,
                            IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH)) {
        case IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_20MHZ: