wifi: mt76: mt7996: Rely on mt7996_vif/sta_link in twt teardown

This is a preliminary patch to enable MLO for MT7996 driver

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20250311-mt7996-mlo-v2-13-31df6972519b@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
index 4a7f6fd9025297f0ffa8ea7e91efd34164a26196..7ddd4b0cadf5d1983379a93ba56da461748ca60e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c
@@ -2691,10 +2691,10 @@ out:
 }
 
 void mt7996_mac_twt_teardown_flow(struct mt7996_dev *dev,
-                                 struct mt7996_sta *msta,
+                                 struct mt7996_vif_link *link,
+                                 struct mt7996_sta_link *msta_link,
                                  u8 flowid)
 {
-       struct mt7996_sta_link *msta_link = &msta->deflink;
        struct mt7996_twt_flow *flow;
 
        lockdep_assert_held(&dev->mt76.mutex);
@@ -2706,8 +2706,7 @@ void mt7996_mac_twt_teardown_flow(struct mt7996_dev *dev,
                return;
 
        flow = &msta_link->twt.flow[flowid];
-       if (mt7996_mcu_twt_agrt_update(dev, &msta->vif->deflink, flow,
-                                      MCU_TWT_AGRT_DELETE))
+       if (mt7996_mcu_twt_agrt_update(dev, link, flow, MCU_TWT_AGRT_DELETE))
                return;
 
        list_del_init(&flow->list);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/main.c b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
index 5ab4f08dba06fdf95ee4e6bc0261749016f07e6a..11ad95e05b94857c95375cdf877518e7ee89f08e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
@@ -1062,7 +1062,8 @@ mt7996_mac_sta_event(struct mt7996_dev *dev, struct ieee80211_vif *vif,
                        break;
                case MT76_STA_EVENT_DISASSOC:
                        for (i = 0; i < ARRAY_SIZE(msta_link->twt.flow); i++)
-                               mt7996_mac_twt_teardown_flow(dev, msta, i);
+                               mt7996_mac_twt_teardown_flow(dev, link,
+                                                            msta_link, i);
 
                        mt7996_mcu_add_sta(dev, link_conf, link_sta, link,
                                           msta_link, CONN_STATE_DISCONNECT,
@@ -1804,10 +1805,12 @@ mt7996_twt_teardown_request(struct ieee80211_hw *hw,
                            u8 flowid)
 {
        struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv;
+       struct mt7996_sta_link *msta_link = &msta->deflink;
+       struct mt7996_vif_link *link = &msta->vif->deflink;
        struct mt7996_dev *dev = mt7996_hw_dev(hw);
 
        mutex_lock(&dev->mt76.mutex);
-       mt7996_mac_twt_teardown_flow(dev, msta, flowid);
+       mt7996_mac_twt_teardown_flow(dev, link, msta_link, flowid);
        mutex_unlock(&dev->mt76.mutex);
 }
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
index 962022c7eec9fd82ebba8e0d5aa6b6eae769ee32..84b9ff707d56501d212932a9fa6a3037259a1077 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h
@@ -709,7 +709,8 @@ void mt7996_mac_dump_work(struct work_struct *work);
 void mt7996_mac_sta_rc_work(struct work_struct *work);
 void mt7996_mac_update_stats(struct mt7996_phy *phy);
 void mt7996_mac_twt_teardown_flow(struct mt7996_dev *dev,
-                                 struct mt7996_sta *msta,
+                                 struct mt7996_vif_link *link,
+                                 struct mt7996_sta_link *msta_link,
                                  u8 flowid);
 void mt7996_mac_add_twt_setup(struct ieee80211_hw *hw,
                              struct ieee80211_sta *sta,