wifi: mt76: mt7915: remove mt7915_mcu_beacon_check_caps()

Those capabilities have been added into ieee80211_bss_conf.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
index 3bbccbd..2ada280 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
@@ -269,7 +269,6 @@ static int mt7915_add_interface(struct ieee80211_hw *hw,
        vif->offload_flags |= IEEE80211_OFFLOAD_ENCAP_4ADDR;
 
        mt7915_init_bitrate_mask(vif);
-       memset(&mvif->cap, -1, sizeof(mvif->cap));
 
        mt7915_mcu_add_bss_info(phy, vif, true);
        mt7915_mcu_add_sta(dev, vif, NULL, true);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 16f09ea..7432b1e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -706,7 +706,6 @@ static void
 mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
                      struct ieee80211_vif *vif)
 {
-       struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
        struct ieee80211_he_cap_elem *elem = &sta->deflink.he_cap.he_cap_elem;
        struct ieee80211_he_mcs_nss_supp mcs_map;
        struct sta_rec_he *he;
@@ -740,7 +739,7 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
             IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_RU_MAPPING_IN_5G))
                cap |= STA_REC_HE_CAP_BW20_RU242_SUPPORT;
 
-       if (mvif->cap.he_ldpc &&
+       if (vif->bss_conf.he_ldpc &&
            (elem->phy_cap_info[1] &
             IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD))
                cap |= STA_REC_HE_CAP_LDPC;
@@ -849,7 +848,6 @@ static void
 mt7915_mcu_sta_muru_tlv(struct mt7915_dev *dev, struct sk_buff *skb,
                        struct ieee80211_sta *sta, struct ieee80211_vif *vif)
 {
-       struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
        struct ieee80211_he_cap_elem *elem = &sta->deflink.he_cap.he_cap_elem;
        struct sta_rec_muru *muru;
        struct tlv *tlv;
@@ -862,9 +860,9 @@ mt7915_mcu_sta_muru_tlv(struct mt7915_dev *dev, struct sk_buff *skb,
 
        muru = (struct sta_rec_muru *)tlv;
 
-       muru->cfg.mimo_dl_en = mvif->cap.he_mu_ebfer ||
-                              mvif->cap.vht_mu_ebfer ||
-                              mvif->cap.vht_mu_ebfee;
+       muru->cfg.mimo_dl_en = vif->bss_conf.he_mu_beamformer ||
+                              vif->bss_conf.vht_mu_beamformer ||
+                              vif->bss_conf.vht_mu_beamformee;
        if (!is_mt7915(&dev->mt76))
                muru->cfg.mimo_ul_en = true;
        muru->cfg.ofdma_dl_en = true;
@@ -997,8 +995,8 @@ mt7915_mcu_sta_wtbl_tlv(struct mt7915_dev *dev, struct sk_buff *skb,
        mt76_connac_mcu_wtbl_hdr_trans_tlv(skb, vif, wcid, tlv, wtbl_hdr);
        if (sta)
                mt76_connac_mcu_wtbl_ht_tlv(&dev->mt76, skb, sta, tlv,
-                                           wtbl_hdr, mvif->cap.ht_ldpc,
-                                           mvif->cap.vht_ldpc);
+                                           wtbl_hdr, vif->bss_conf.ht_ldpc,
+                                           vif->bss_conf.vht_ldpc);
 
        return 0;
 }
@@ -1007,7 +1005,6 @@ static inline bool
 mt7915_is_ebf_supported(struct mt7915_phy *phy, struct ieee80211_vif *vif,
                        struct ieee80211_sta *sta, bool bfee)
 {
-       struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
        int tx_ant = hweight8(phy->mt76->chainmask) - 1;
 
        if (vif->type != NL80211_IFTYPE_STATION &&
@@ -1021,10 +1018,10 @@ mt7915_is_ebf_supported(struct mt7915_phy *phy, struct ieee80211_vif *vif,
                struct ieee80211_he_cap_elem *pe = &sta->deflink.he_cap.he_cap_elem;
 
                if (bfee)
-                       return mvif->cap.he_su_ebfee &&
+                       return vif->bss_conf.he_su_beamformee &&
                               HE_PHY(CAP3_SU_BEAMFORMER, pe->phy_cap_info[3]);
                else
-                       return mvif->cap.he_su_ebfer &&
+                       return vif->bss_conf.he_su_beamformer &&
                               HE_PHY(CAP4_SU_BEAMFORMEE, pe->phy_cap_info[4]);
        }
 
@@ -1032,10 +1029,10 @@ mt7915_is_ebf_supported(struct mt7915_phy *phy, struct ieee80211_vif *vif,
                u32 cap = sta->deflink.vht_cap.cap;
 
                if (bfee)
-                       return mvif->cap.vht_su_ebfee &&
+                       return vif->bss_conf.vht_su_beamformee &&
                               (cap & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE);
                else
-                       return mvif->cap.vht_su_ebfer &&
+                       return vif->bss_conf.vht_su_beamformer &&
                               (cap & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE);
        }
 
@@ -1530,7 +1527,7 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb, struct mt7915_dev *dev,
                        cap |= STA_CAP_TX_STBC;
                if (sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_RX_STBC)
                        cap |= STA_CAP_RX_STBC;
-               if (mvif->cap.ht_ldpc &&
+               if (vif->bss_conf.ht_ldpc &&
                    (sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_LDPC_CODING))
                        cap |= STA_CAP_LDPC;
 
@@ -1556,7 +1553,7 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb, struct mt7915_dev *dev,
                        cap |= STA_CAP_VHT_TX_STBC;
                if (sta->deflink.vht_cap.cap & IEEE80211_VHT_CAP_RXSTBC_1)
                        cap |= STA_CAP_VHT_RX_STBC;
-               if (mvif->cap.vht_ldpc &&
+               if (vif->bss_conf.vht_ldpc &&
                    (sta->deflink.vht_cap.cap & IEEE80211_VHT_CAP_RXLDPC))
                        cap |= STA_CAP_VHT_LDPC;
 
@@ -1876,84 +1873,6 @@ mt7915_mcu_beacon_cont(struct mt7915_dev *dev, struct ieee80211_vif *vif,
 }
 
 static void
-mt7915_mcu_beacon_check_caps(struct mt7915_phy *phy, struct ieee80211_vif *vif,
-                            struct sk_buff *skb)
-{
-       struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
-       struct mt7915_vif_cap *vc = &mvif->cap;
-       const struct ieee80211_he_cap_elem *he;
-       const struct ieee80211_vht_cap *vht;
-       const struct ieee80211_ht_cap *ht;
-       struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb->data;
-       const u8 *ie;
-       u32 len, bc;
-
-       /* Check missing configuration options to allow AP mode in mac80211
-        * to remain in sync with hostapd settings, and get a subset of
-        * beacon and hardware capabilities.
-        */
-       if (WARN_ON_ONCE(skb->len <= (mgmt->u.beacon.variable - skb->data)))
-               return;
-
-       memset(vc, 0, sizeof(*vc));
-
-       len = skb->len - (mgmt->u.beacon.variable - skb->data);
-
-       ie = cfg80211_find_ie(WLAN_EID_HT_CAPABILITY, mgmt->u.beacon.variable,
-                             len);
-       if (ie && ie[1] >= sizeof(*ht)) {
-               ht = (void *)(ie + 2);
-               vc->ht_ldpc = !!(le16_to_cpu(ht->cap_info) &
-                                IEEE80211_HT_CAP_LDPC_CODING);
-       }
-
-       ie = cfg80211_find_ie(WLAN_EID_VHT_CAPABILITY, mgmt->u.beacon.variable,
-                             len);
-       if (ie && ie[1] >= sizeof(*vht)) {
-               u32 pc = phy->mt76->sband_5g.sband.vht_cap.cap;
-
-               vht = (void *)(ie + 2);
-               bc = le32_to_cpu(vht->vht_cap_info);
-
-               vc->vht_ldpc = !!(bc & IEEE80211_VHT_CAP_RXLDPC);
-               vc->vht_su_ebfer =
-                       (bc & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE) &&
-                       (pc & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE);
-               vc->vht_su_ebfee =
-                       (bc & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE) &&
-                       (pc & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE);
-               vc->vht_mu_ebfer =
-                       (bc & IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE) &&
-                       (pc & IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE);
-               vc->vht_mu_ebfee =
-                       (bc & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE) &&
-                       (pc & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE);
-       }
-
-       ie = cfg80211_find_ext_ie(WLAN_EID_EXT_HE_CAPABILITY,
-                                 mgmt->u.beacon.variable, len);
-       if (ie && ie[1] >= sizeof(*he) + 1) {
-               const struct ieee80211_sta_he_cap *pc =
-                       mt76_connac_get_he_phy_cap(phy->mt76, vif);
-               const struct ieee80211_he_cap_elem *pe = &pc->he_cap_elem;
-
-               he = (void *)(ie + 3);
-
-               vc->he_ldpc =
-                       HE_PHY(CAP1_LDPC_CODING_IN_PAYLOAD, pe->phy_cap_info[1]);
-               vc->he_su_ebfer =
-                       HE_PHY(CAP3_SU_BEAMFORMER, he->phy_cap_info[3]) &&
-                       HE_PHY(CAP3_SU_BEAMFORMER, pe->phy_cap_info[3]);
-               vc->he_su_ebfee =
-                       HE_PHY(CAP4_SU_BEAMFORMEE, he->phy_cap_info[4]) &&
-                       HE_PHY(CAP4_SU_BEAMFORMEE, pe->phy_cap_info[4]);
-               vc->he_mu_ebfer =
-                       HE_PHY(CAP4_MU_BEAMFORMER, he->phy_cap_info[4]) &&
-                       HE_PHY(CAP4_MU_BEAMFORMER, pe->phy_cap_info[4]);
-       }
-}
-
-static void
 mt7915_mcu_beacon_inband_discov(struct mt7915_dev *dev, struct ieee80211_vif *vif,
                                struct sk_buff *rskb, struct bss_info_bcn *bcn,
                                u32 changed)
@@ -2063,8 +1982,6 @@ int mt7915_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
        info = IEEE80211_SKB_CB(skb);
        info->hw_queue = FIELD_PREP(MT_TX_HW_QUEUE_PHY, ext_phy);
 
-       mt7915_mcu_beacon_check_caps(phy, vif, skb);
-
        mt7915_mcu_beacon_cntdwn(vif, rskb, skb, bcn, &offs);
        mt7915_mcu_beacon_mbss(rskb, skb, vif, bcn, &offs);
        mt7915_mcu_beacon_cont(dev, vif, rskb, skb, bcn, &offs);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index 3cbfb9b..e4016ce 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -147,23 +147,9 @@ struct mt7915_sta {
        } twt;
 };
 
-struct mt7915_vif_cap {
-       bool ht_ldpc:1;
-       bool vht_ldpc:1;
-       bool he_ldpc:1;
-       bool vht_su_ebfer:1;
-       bool vht_su_ebfee:1;
-       bool vht_mu_ebfer:1;
-       bool vht_mu_ebfee:1;
-       bool he_su_ebfer:1;
-       bool he_su_ebfee:1;
-       bool he_mu_ebfer:1;
-};
-
 struct mt7915_vif {
        struct mt76_vif mt76; /* must be first */
 
-       struct mt7915_vif_cap cap;
        struct mt7915_sta sta;
        struct mt7915_phy *phy;