Commit f5020655 authored by Sean Wang's avatar Sean Wang Committed by Felix Fietkau
Browse files

wifi: mt76: move struct ieee80211_chanctx_conf up to struct mt76_vif 



Move struct ieee80211_chanctx_conf up to struct mt76_vif to allow the
connac2 library can access the struct ieee80211_chanctx_conf * member in
struct mt76_vif.

Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Reviewed-by: default avatarDavid Ruth <druth@chromium.org>
Tested-by: default avatarDavid Ruth <druth@chromium.org>
Signed-off-by: default avatarDeren Wu <deren.wu@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 1f39e1d9

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

+1 −0
Original line number Diff line number Diff line
@@ -712,6 +712,7 @@ struct mt76_vif { 
	u8 basic_rates_idx;

	u8 mcast_rates_idx;

	u8 beacon_rates_idx;

	struct ieee80211_chanctx_conf *ctx;

};



struct mt76_phy {

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

+6 −6
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ void mt7921_mac_sta_assoc(struct mt76_dev *mdev, struct ieee80211_vif *vif, 


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

		mt76_connac_mcu_uni_add_bss(&dev->mphy, vif, &mvif->sta.wcid,

					    true, mvif->ctx);

					    true, mvif->mt76.ctx);



	ewma_avg_signal_init(&msta->avg_ack_signal);
@@ -788,7 +788,7 @@ void mt7921_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif, 
		if (!sta->tdls)

			mt76_connac_mcu_uni_add_bss(&dev->mphy, vif,

						    &mvif->sta.wcid, false,

						    mvif->ctx);

						    mvif->mt76.ctx);

	}



	spin_lock_bh(&dev->mt76.sta_poll_lock);
@@ -1205,7 +1205,7 @@ mt7921_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	mt792x_mutex_acquire(dev);



	err = mt76_connac_mcu_uni_add_bss(phy->mt76, vif, &mvif->sta.wcid,

					  true, mvif->ctx);

					  true, mvif->mt76.ctx);

	if (err)

		goto out;
@@ -1237,7 +1237,7 @@ mt7921_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
		goto out;



	mt76_connac_mcu_uni_add_bss(phy->mt76, vif, &mvif->sta.wcid, false,

				    mvif->ctx);

				    mvif->mt76.ctx);



out:

	mt792x_mutex_release(dev);
@@ -1262,7 +1262,7 @@ static void mt7921_ctx_iter(void *priv, u8 *mac, 
	struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;

	struct ieee80211_chanctx_conf *ctx = priv;



	if (ctx != mvif->ctx)

	if (ctx != mvif->mt76.ctx)

		return;



	if (vif->type == NL80211_IFTYPE_MONITOR)
@@ -1295,7 +1295,7 @@ static void mt7921_mgd_prepare_tx(struct ieee80211_hw *hw, 
		       jiffies_to_msecs(HZ);



	mt792x_mutex_acquire(dev);

	mt7921_set_roc(mvif->phy, mvif, mvif->ctx->def.chan, duration,

	mt7921_set_roc(mvif->phy, mvif, mvif->mt76.ctx->def.chan, duration,

		       MT7921_ROC_REQ_JOIN);

	mt792x_mutex_release(dev);

}

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

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ struct mt792x_vif { 
	struct ewma_rssi rssi;



	struct ieee80211_tx_queue_params queue_params[IEEE80211_NUM_ACS];

	struct ieee80211_chanctx_conf *ctx;

};



struct mt792x_phy {

drivers/net/wireless/mediatek/mt76/mt792x_core.c

+2 −2
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ int mt792x_assign_vif_chanctx(struct ieee80211_hw *hw, 
	struct mt792x_dev *dev = mt792x_hw_dev(hw);



	mutex_lock(&dev->mt76.mutex);

	mvif->ctx = ctx;

	mvif->mt76.ctx = ctx;

	mutex_unlock(&dev->mt76.mutex);



	return 0;
@@ -259,7 +259,7 @@ void mt792x_unassign_vif_chanctx(struct ieee80211_hw *hw, 
	struct mt792x_dev *dev = mt792x_hw_dev(hw);



	mutex_lock(&dev->mt76.mutex);

	mvif->ctx = NULL;

	mvif->mt76.ctx = NULL;

	mutex_unlock(&dev->mt76.mutex);

}

EXPORT_SYMBOL_GPL(mt792x_unassign_vif_chanctx);