Commit 1eae3fb9 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: mt7615: run mt7615_pm_wake in mt7615_mac_sta_{add,remove} 



Run mt7615_pm_wake()/mt7615_pm_power_save_sched() directly in order to
wake the device from low power state in mt7615_mac_sta_{add,remove}
since they run holding mt76 mutex in common mt76 code

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 2b8cdfb2

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

+10 −1
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ int mt7615_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif, 
	struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);

	struct mt7615_sta *msta = (struct mt7615_sta *)sta->drv_priv;

	struct mt7615_vif *mvif = (struct mt7615_vif *)vif->drv_priv;

	int idx;

	int idx, err;



	idx = mt76_wcid_alloc(dev->mt76.wcid_mask, MT7615_WTBL_STA - 1);

	if (idx < 0)
@@ -595,6 +595,10 @@ int mt7615_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif, 
	msta->wcid.idx = idx;

	msta->wcid.ext_phy = mvif->band_idx;



	err = mt7615_pm_wake(dev);

	if (err)

		return err;



	if (vif->type == NL80211_IFTYPE_STATION && !sta->tdls) {

		struct mt7615_phy *phy;
@@ -605,6 +609,8 @@ int mt7615_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif, 
			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);

	mt7615_mcu_sta_add(dev, vif, sta, true);



	mt7615_pm_power_save_sched(dev);



	return 0;

}

EXPORT_SYMBOL_GPL(mt7615_mac_sta_add);
@@ -616,6 +622,7 @@ void mt7615_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif, 
	struct mt7615_sta *msta = (struct mt7615_sta *)sta->drv_priv;



	mt7615_free_pending_tx_skbs(dev, msta);

	mt7615_pm_wake(dev);



	mt7615_mcu_sta_add(dev, vif, sta, false);

	mt7615_mac_wtbl_update(dev, msta->wcid.idx,
@@ -632,6 +639,8 @@ void mt7615_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif, 
	if (!list_empty(&msta->poll_list))

		list_del_init(&msta->poll_list);

	spin_unlock_bh(&dev->sta_poll_lock);



	mt7615_pm_power_save_sched(dev);

}

EXPORT_SYMBOL_GPL(mt7615_mac_sta_remove);