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

mt76: mt7615: move mcu bss upload before creating the sta 



Run mt7615_mcu_add_bss_info routine before mt7615_mcu_sta_add since
the firmware requires the bss is created before the relative sta

Tested-by: default avatarSean Wang <sean.wang@mediatek.com>
Suggested-by: default avatarYF Luo <yf.luo@mediatek.com>
Suggested-by: default avatarLucy Hsu <lucy.hsu@mediatek.com>
Co-developed-by: default avatarSoul Huang <soul.huang@mediatek.com>
Signed-off-by: default avatarSoul Huang <soul.huang@mediatek.com>
Co-developed-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 40a61c9b

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

+13 −4
Original line number Diff line number Diff line
@@ -491,9 +491,6 @@ static void mt7615_bss_info_changed(struct ieee80211_hw *hw, 


	mutex_lock(&dev->mt76.mutex);



	if (changed & BSS_CHANGED_ASSOC)

		mt7615_mcu_add_bss_info(phy, vif, info->assoc);



	if (changed & BSS_CHANGED_ERP_SLOT) {

		int slottime = info->use_short_slot ? 9 : 20;
@@ -545,9 +542,14 @@ int mt7615_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif, 
	msta->wcid.idx = idx;

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



	if (vif->type == NL80211_IFTYPE_STATION) {

		struct mt7615_phy *phy;



		phy = mvif->band_idx ? mt7615_ext_phy(dev) : &dev->phy;

		mt7615_mcu_add_bss_info(phy, vif, true);

	}

	mt7615_mac_wtbl_update(dev, idx,

			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);



	mt7615_mcu_sta_add(dev, vif, sta, true);



	return 0;
@@ -563,6 +565,13 @@ void mt7615_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif, 
	mt7615_mcu_sta_add(dev, vif, sta, false);

	mt7615_mac_wtbl_update(dev, msta->wcid.idx,

			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);

	if (vif->type == NL80211_IFTYPE_STATION) {

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

		struct mt7615_phy *phy;



		phy = mvif->band_idx ? mt7615_ext_phy(dev) : &dev->phy;

		mt7615_mcu_add_bss_info(phy, vif, false);

	}



	spin_lock_bh(&dev->sta_poll_lock);

	if (!list_empty(&msta->poll_list))

CRA Git | Maintained and supported by SUSTech CRA and CCSE