Skip to content

Commit 3c477b7

Browse files
LorenzoBianconinbd168
authored andcommitted
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>
1 parent 7854cc9 commit 3c477b7

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

drivers/net/wireless/mediatek/mt76/mt7996/mac.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2691,10 +2691,10 @@ void mt7996_mac_add_twt_setup(struct ieee80211_hw *hw,
26912691
}
26922692

26932693
void mt7996_mac_twt_teardown_flow(struct mt7996_dev *dev,
2694-
struct mt7996_sta *msta,
2694+
struct mt7996_vif_link *link,
2695+
struct mt7996_sta_link *msta_link,
26952696
u8 flowid)
26962697
{
2697-
struct mt7996_sta_link *msta_link = &msta->deflink;
26982698
struct mt7996_twt_flow *flow;
26992699

27002700
lockdep_assert_held(&dev->mt76.mutex);
@@ -2706,8 +2706,7 @@ void mt7996_mac_twt_teardown_flow(struct mt7996_dev *dev,
27062706
return;
27072707

27082708
flow = &msta_link->twt.flow[flowid];
2709-
if (mt7996_mcu_twt_agrt_update(dev, &msta->vif->deflink, flow,
2710-
MCU_TWT_AGRT_DELETE))
2709+
if (mt7996_mcu_twt_agrt_update(dev, link, flow, MCU_TWT_AGRT_DELETE))
27112710
return;
27122711

27132712
list_del_init(&flow->list);

drivers/net/wireless/mediatek/mt76/mt7996/main.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,7 +1062,8 @@ mt7996_mac_sta_event(struct mt7996_dev *dev, struct ieee80211_vif *vif,
10621062
break;
10631063
case MT76_STA_EVENT_DISASSOC:
10641064
for (i = 0; i < ARRAY_SIZE(msta_link->twt.flow); i++)
1065-
mt7996_mac_twt_teardown_flow(dev, msta, i);
1065+
mt7996_mac_twt_teardown_flow(dev, link,
1066+
msta_link, i);
10661067

10671068
mt7996_mcu_add_sta(dev, link_conf, link_sta, link,
10681069
msta_link, CONN_STATE_DISCONNECT,
@@ -1804,10 +1805,12 @@ mt7996_twt_teardown_request(struct ieee80211_hw *hw,
18041805
u8 flowid)
18051806
{
18061807
struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv;
1808+
struct mt7996_sta_link *msta_link = &msta->deflink;
1809+
struct mt7996_vif_link *link = &msta->vif->deflink;
18071810
struct mt7996_dev *dev = mt7996_hw_dev(hw);
18081811

18091812
mutex_lock(&dev->mt76.mutex);
1810-
mt7996_mac_twt_teardown_flow(dev, msta, flowid);
1813+
mt7996_mac_twt_teardown_flow(dev, link, msta_link, flowid);
18111814
mutex_unlock(&dev->mt76.mutex);
18121815
}
18131816

drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,8 @@ void mt7996_mac_dump_work(struct work_struct *work);
709709
void mt7996_mac_sta_rc_work(struct work_struct *work);
710710
void mt7996_mac_update_stats(struct mt7996_phy *phy);
711711
void mt7996_mac_twt_teardown_flow(struct mt7996_dev *dev,
712-
struct mt7996_sta *msta,
712+
struct mt7996_vif_link *link,
713+
struct mt7996_sta_link *msta_link,
713714
u8 flowid);
714715
void mt7996_mac_add_twt_setup(struct ieee80211_hw *hw,
715716
struct ieee80211_sta *sta,

0 commit comments

Comments
 (0)