wifi: mt76: connac: rework fields for larger bandwidth support in sta_rec_bf

Rename nrow_bw160 and ncol_bw160 since channel width 320 MHz will share
the same field.
This is a preliminary patch to add mt7996 chipset support.

Signed-off-by: MeiChia Chiu <meichia.chiu@mediatek.com>
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index 97965b0..d79fa68 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -465,8 +465,8 @@ struct sta_rec_bf {
        u8 ibf_dbw;
        u8 ibf_ncol;
        u8 ibf_nrow;
-       u8 nrow_bw160;
-       u8 ncol_bw160;
+       u8 nrow_gt_bw80;
+       u8 ncol_gt_bw80;
        u8 ru_start_idx;
        u8 ru_end_idx;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 17e13fd..8b903a7 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -1131,7 +1131,7 @@ mt7915_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif,
                mcs_map = le16_to_cpu(pc->he_mcs_nss_supp.rx_mcs_160);
                nss_mcs = mt7915_mcu_get_sta_nss(mcs_map);
 
-               bf->ncol_bw160 = nss_mcs;
+               bf->ncol_gt_bw80 = nss_mcs;
        }
 
        if (pe->phy_cap_info[0] &
@@ -1139,10 +1139,10 @@ mt7915_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif,
                mcs_map = le16_to_cpu(pc->he_mcs_nss_supp.rx_mcs_80p80);
                nss_mcs = mt7915_mcu_get_sta_nss(mcs_map);
 
-               if (bf->ncol_bw160)
-                       bf->ncol_bw160 = min_t(u8, bf->ncol_bw160, nss_mcs);
+               if (bf->ncol_gt_bw80)
+                       bf->ncol_gt_bw80 = min_t(u8, bf->ncol_gt_bw80, nss_mcs);
                else
-                       bf->ncol_bw160 = nss_mcs;
+                       bf->ncol_gt_bw80 = nss_mcs;
        }
 
        snd_dim = HE_PHY(CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_MASK,
@@ -1150,7 +1150,7 @@ mt7915_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif,
        sts = HE_PHY(CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_MASK,
                     pe->phy_cap_info[4]);
 
-       bf->nrow_bw160 = min_t(int, snd_dim, sts);
+       bf->nrow_gt_bw80 = min_t(int, snd_dim, sts);
 }
 
 static void