wifi: mac80211: add EHT MU-MIMO related flags in ieee80211_bss_conf

Similar to VHT/HE. This is utilized to pass MU-MIMO configurations
from user space (i.e. hostapd) to driver.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Link: https://lore.kernel.org/r/8d9966c4c1e77cb1ade77d42bdc49905609192e9.1676628065.git.ryder.lee@mediatek.com
[move into combined if statement, reset on !eht]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 722b99e54ad202338e55e3dd04c87971c966bccb..410cd3daaa59da84c4e1aef9b85cdd8b6be4586b 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -674,6 +674,12 @@ struct ieee80211_fils_discovery {
  * @he_full_ul_mumimo: does this BSS support the reception (AP) or transmission
  *     (non-AP STA) of an HE TB PPDU on an RU that spans the entire PPDU
  *     bandwidth
+ * @eht_su_beamformer: in AP-mode, does this BSS enable operation as an EHT SU
+ *     beamformer
+ * @eht_su_beamformee: in AP-mode, does this BSS enable operation as an EHT SU
+ *     beamformee
+ * @eht_mu_beamformer: in AP-mode, does this BSS enable operation as an EHT MU
+ *     beamformer
  */
 struct ieee80211_bss_conf {
        struct ieee80211_vif *vif;
@@ -761,6 +767,9 @@ struct ieee80211_bss_conf {
        bool he_su_beamformee;
        bool he_mu_beamformer;
        bool he_full_ul_mumimo;
+       bool eht_su_beamformer;
+       bool eht_su_beamformee;
+       bool eht_mu_beamformer;
 };
 
 /**

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 2c8fa19c2f248955891b5ef4a2f02d30d7437297..9789008626a50563d657676a0a3ce606a23c6e0c 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1299,6 +1299,22 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
        if (params->eht_cap) {
                link_conf->eht_puncturing = params->punct_bitmap;
                changed |= BSS_CHANGED_EHT_PUNCTURING;
+
+               link_conf->eht_su_beamformer =
+                       params->eht_cap->fixed.phy_cap_info[0] &
+                               IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMER;
+               link_conf->eht_su_beamformee =
+                       params->eht_cap->fixed.phy_cap_info[0] &
+                               IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMEE;
+               link_conf->eht_mu_beamformer =
+                       params->eht_cap->fixed.phy_cap_info[7] &
+                               (IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_80MHZ |
+                                IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_160MHZ |
+                                IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_320MHZ);
+       } else {
+               link_conf->eht_su_beamformer = false;
+               link_conf->eht_su_beamformee = false;
+               link_conf->eht_mu_beamformer = false;
        }
 
        if (sdata->vif.type == NL80211_IFTYPE_AP &&