Commit 9e5f6dd7 authored by Felix Fietkau's avatar Felix Fietkau
Browse files

mt76: move txpower_conf back to driver specific structs 



Nothing in the core uses it

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

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

+0 −1
Original line number Diff line number Diff line
@@ -534,7 +534,6 @@ struct mt76_dev { 
	struct mt76_hw_cap cap;



	struct mt76_rate_power rate_power;

	int txpower_conf;

	int txpower_cur;



	enum nl80211_dfs_regions region;

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

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ int mt76x0_config(struct ieee80211_hw *hw, u32 changed) 
	}



	if (changed & IEEE80211_CONF_CHANGE_POWER) {

		dev->mt76.txpower_conf = hw->conf.power_level * 2;

		dev->txpower_conf = hw->conf.power_level * 2;



		if (test_bit(MT76_STATE_RUNNING, &dev->mphy.state))

			mt76x0_phy_set_txpower(dev);

drivers/net/wireless/mediatek/mt76/mt76x0/phy.c

+1 −1
Original line number Diff line number Diff line
@@ -848,7 +848,7 @@ void mt76x0_phy_set_txpower(struct mt76x02_dev *dev) 
	mt76x0_get_power_info(dev, dev->mphy.chandef.chan, &info);



	mt76x02_add_rate_power_offset(t, info);

	mt76x02_limit_rate_power(t, dev->mt76.txpower_conf);

	mt76x02_limit_rate_power(t, dev->txpower_conf);

	dev->mt76.txpower_cur = mt76x02_get_max_rate_power(t);

	mt76x02_add_rate_power_offset(t, -info);

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

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ struct mt76x02_dev { 


	struct mt76x02_calibration cal;



	int txpower_conf;

	s8 target_power;

	s8 target_power_delta[2];

	bool enable_tpc;

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

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi, 
		max_txpwr_adj = mt76x02_tx_get_max_txpwr_adj(dev, rate);

	}



	txpwr_adj = mt76x02_tx_get_txpwr_adj(dev, dev->mt76.txpower_conf,

	txpwr_adj = mt76x02_tx_get_txpwr_adj(dev, dev->txpower_conf,

					     max_txpwr_adj);

	txwi->ctl2 = FIELD_PREP(MT_TX_PWR_ADJ, txpwr_adj);