wifi: mt76: mt7925: update mt7925_mac_link_sta_[add, assoc, remove] for MLO

[add, assoc, remove] the per-link STA from the corresponding to per-link
BSS with the same link id. The change remains compatible with the non-MLO
mode.

Co-developed-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Co-developed-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Link: https://patch.msgid.link/2410cc73eec3849c2185b5cfa613b7e903e68abb.1720248331.git.sean.wang@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
index 8b10b63bc98dd43ea9a7605e48faacc9d5c5211e..a043d93f3e1d655e544a0b1a559ee7ee59ce0b1a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
@@ -728,21 +728,24 @@ static int mt7925_mac_link_sta_add(struct mt76_dev *mdev,
        struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);
        struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
        struct ieee80211_bss_conf *link_conf;
+       struct mt792x_bss_conf *mconf;
+       u8 link_id = link_sta->link_id;
        struct mt792x_link_sta *mlink;
        struct mt792x_sta *msta;
        int ret, idx;
 
        msta = (struct mt792x_sta *)link_sta->sta->drv_priv;
-       mlink = mt792x_sta_to_link(msta, link_sta->link_id);
+       mlink = mt792x_sta_to_link(msta, link_id);
 
        idx = mt76_wcid_alloc(dev->mt76.wcid_mask, MT792x_WTBL_STA - 1);
        if (idx < 0)
                return -ENOSPC;
 
+       mconf = mt792x_vif_to_link(mvif, link_id);
        INIT_LIST_HEAD(&mlink->wcid.poll_list);
        mlink->wcid.sta = 1;
        mlink->wcid.idx = idx;
-       mlink->wcid.phy_idx = mvif->bss_conf.mt76.band_idx;
+       mlink->wcid.phy_idx = mconf->mt76.band_idx;
        mlink->wcid.tx_info |= MT_WCID_TX_INFO_SET;
        mlink->last_txs = jiffies;
 
@@ -753,11 +756,11 @@ static int mt7925_mac_link_sta_add(struct mt76_dev *mdev,
        mt7925_mac_wtbl_update(dev, idx,
                               MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
 
-       link_conf = mt792x_vif_to_bss_conf(vif, vif->bss_conf.link_id);
+       link_conf = mt792x_vif_to_bss_conf(vif, link_id);
 
        /* should update bss info before STA add */
        if (vif->type == NL80211_IFTYPE_STATION && !link_sta->sta->tdls)
-               mt7925_mcu_add_bss_info(&dev->phy, mvif->bss_conf.mt76.ctx,
+               mt7925_mcu_add_bss_info(&dev->phy, mconf->mt76.ctx,
                                        link_conf, link_sta, false);
 
        ret = mt7925_mcu_sta_update(dev, link_sta, vif, true,
@@ -790,7 +793,6 @@ static void mt7925_mac_link_sta_assoc(struct mt76_dev *mdev,
                                      struct ieee80211_link_sta *link_sta)
 {
        struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);
-       struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
        struct ieee80211_bss_conf *link_conf;
        struct mt792x_link_sta *mlink;
        struct mt792x_sta *msta;
@@ -802,9 +804,13 @@ static void mt7925_mac_link_sta_assoc(struct mt76_dev *mdev,
 
        link_conf = mt792x_vif_to_bss_conf(vif, vif->bss_conf.link_id);
 
-       if (vif->type == NL80211_IFTYPE_STATION && !link_sta->sta->tdls)
-               mt7925_mcu_add_bss_info(&dev->phy, mvif->bss_conf.mt76.ctx,
+       if (vif->type == NL80211_IFTYPE_STATION && !link_sta->sta->tdls) {
+               struct mt792x_bss_conf *mconf;
+
+               mconf = mt792x_link_conf_to_mconf(link_conf);
+               mt7925_mcu_add_bss_info(&dev->phy, mconf->mt76.ctx,
                                        link_conf, link_sta, true);
+       }
 
        ewma_avg_signal_init(&mlink->avg_ack_signal);
 
@@ -830,11 +836,12 @@ static void mt7925_mac_link_sta_remove(struct mt76_dev *mdev,
 {
        struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);
        struct ieee80211_bss_conf *link_conf;
+       u8 link_id = link_sta->link_id;
        struct mt792x_link_sta *mlink;
        struct mt792x_sta *msta;
 
        msta = (struct mt792x_sta *)link_sta->sta->drv_priv;
-       mlink = mt792x_sta_to_link(msta, link_sta->link_id);
+       mlink = mt792x_sta_to_link(msta, link_id);
 
        mt76_connac_free_pending_tx_skbs(&dev->pm, &mlink->wcid);
        mt76_connac_pm_wake(&dev->mphy, &dev->pm);
@@ -844,12 +851,13 @@ static void mt7925_mac_link_sta_remove(struct mt76_dev *mdev,
        mt7925_mac_wtbl_update(dev, mlink->wcid.idx,
                               MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
 
-       link_conf = mt792x_vif_to_bss_conf(vif, vif->bss_conf.link_id);
+       link_conf = mt792x_vif_to_bss_conf(vif, link_id);
 
        if (vif->type == NL80211_IFTYPE_STATION && !link_sta->sta->tdls) {
-               struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
-               mt7925_mcu_add_bss_info(&dev->phy,
-                                       mvif->bss_conf.mt76.ctx, link_conf,
+               struct mt792x_bss_conf *mconf;
+
+               mconf = mt792x_link_conf_to_mconf(link_conf);
+               mt7925_mcu_add_bss_info(&dev->phy, mconf->mt76.ctx, link_conf,
                                        link_sta, false);
        }