Commit 3c477b7f authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

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: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20250311-mt7996-mlo-v2-13-31df6972519b@kernel.org


Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 7854cc94

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

+3 −4
Original line number Diff line number Diff line
@@ -2691,10 +2691,10 @@ void mt7996_mac_add_twt_setup(struct ieee80211_hw *hw, 
}



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);

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

+5 −2
Original line number Diff line number Diff line
@@ -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);

}

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

+2 −1
Original line number Diff line number Diff line
@@ -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,