Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

mt76: move mt76x02_get_txpower in mt76x02_util.c 



Move mt76x02_get_txpower utility routine in mt76x02-lib module
in order to be reused by mt76x0 and mt76x2u drivers

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent c2756a1c

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

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ static const struct ieee80211_ops mt76x0e_ops = { 
	.sta_rate_tbl_update = mt76x02_sta_rate_tbl_update,

	.wake_tx_queue = mt76_wake_tx_queue,

	.get_survey = mt76_get_survey,

	.get_txpower = mt76x02_get_txpower,

};



static int mt76x0e_register_device(struct mt76x02_dev *dev)

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

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ static const struct ieee80211_ops mt76x0u_ops = { 
	.sta_rate_tbl_update = mt76x02_sta_rate_tbl_update,

	.set_rts_threshold = mt76x0_set_rts_threshold,

	.wake_tx_queue = mt76_wake_tx_queue,

	.get_txpower = mt76x02_get_txpower,

};



static int mt76x0u_register_device(struct mt76x02_dev *dev)

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

+2 −0
Original line number Diff line number Diff line
@@ -151,6 +151,8 @@ void mt76x02_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
		     const u8 *mac);

void mt76x02_sw_scan_complete(struct ieee80211_hw *hw,

			      struct ieee80211_vif *vif);

int mt76x02_get_txpower(struct ieee80211_hw *hw,

			struct ieee80211_vif *vif, int *dbm);



extern const u16 mt76x02_beacon_offsets[16];

void mt76x02_set_beacon_offsets(struct mt76x02_dev *dev);

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

+18 −0
Original line number Diff line number Diff line
@@ -508,6 +508,24 @@ void mt76x02_sw_scan_complete(struct ieee80211_hw *hw, 
}

EXPORT_SYMBOL_GPL(mt76x02_sw_scan_complete);



int mt76x02_get_txpower(struct ieee80211_hw *hw,

			struct ieee80211_vif *vif, int *dbm)

{

	struct mt76x02_dev *dev = hw->priv;

	u8 nstreams = dev->mt76.chainmask & 0xf;



	*dbm = dev->mt76.txpower_cur / 2;



	/* convert from per-chain power to combined

	 * output on 2x2 devices

	 */

	if (nstreams > 1)

		*dbm += 3;



	return 0;

}

EXPORT_SYMBOL_GPL(mt76x02_get_txpower);



const u16 mt76x02_beacon_offsets[16] = {

	/* 1024 byte per beacon */

	0xc000,

drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c

+1 −14
Original line number Diff line number Diff line
@@ -181,19 +181,6 @@ mt76x2_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
{

}



static int

mt76x2_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif, int *dbm)

{

	struct mt76x02_dev *dev = hw->priv;



	*dbm = dev->mt76.txpower_cur / 2;



	/* convert from per-chain power to combined output on 2x2 devices */

	*dbm += 3;



	return 0;

}



static void mt76x2_set_coverage_class(struct ieee80211_hw *hw,

				      s16 coverage_class)

{
@@ -277,7 +264,7 @@ const struct ieee80211_ops mt76x2_ops = { 
	.sw_scan_complete = mt76x02_sw_scan_complete,

	.flush = mt76x2_flush,

	.ampdu_action = mt76x02_ampdu_action,

	.get_txpower = mt76x2_get_txpower,

	.get_txpower = mt76x02_get_txpower,

	.wake_tx_queue = mt76_wake_tx_queue,

	.sta_rate_tbl_update = mt76x02_sta_rate_tbl_update,

	.release_buffered_frames = mt76_release_buffered_frames,