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

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

mt76: move mt76x02_set_tx_ackto in mt76x02-lib module 



Move mt76x02_set_tx_ackto and mt76x02_set_coverage_class routines
in mt76x02-lib module in order to be reused by mt76x0 driver.
This is a preliminary patch to unify drv_bss_info_changed mac80211
callback between mt76x0 and mt76x2 drivers

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

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

+2 −2
Original line number Diff line number Diff line
@@ -117,8 +117,8 @@ void mt76x0_bss_info_changed(struct ieee80211_hw *hw, 
	if (changed & BSS_CHANGED_ERP_SLOT) {

		int slottime = info->use_short_slot ? 9 : 20;



		mt76_rmw_field(dev, MT_BKOFF_SLOT_CFG,

			       MT_BKOFF_SLOT_CFG_SLOTTIME, slottime);

		dev->slottime = slottime;

		mt76x02_set_tx_ackto(dev);

	}



	mutex_unlock(&dev->mt76.mutex);

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

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ static const struct ieee80211_ops mt76x0e_ops = { 
	.flush = mt76x0e_flush,

	.set_tim = mt76x0e_set_tim,

	.release_buffered_frames = mt76_release_buffered_frames,

	.set_coverage_class = mt76x02_set_coverage_class,

};



static int mt76x0e_register_device(struct mt76x02_dev *dev)

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

+3 −0
Original line number Diff line number Diff line
@@ -133,6 +133,9 @@ s8 mt76x02_tx_get_max_txpwr_adj(struct mt76x02_dev *dev, 
s8 mt76x02_tx_get_txpwr_adj(struct mt76x02_dev *dev, s8 txpwr,

			    s8 max_txpwr_adj);

void mt76x02_tx_set_txpwr_auto(struct mt76x02_dev *dev, s8 txpwr);

void mt76x02_set_tx_ackto(struct mt76x02_dev *dev);

void mt76x02_set_coverage_class(struct ieee80211_hw *hw,

				s16 coverage_class);

int mt76x02_insert_hdr_pad(struct sk_buff *skb);

void mt76x02_remove_hdr_pad(struct sk_buff *skb, int len);

void mt76x02_tx_complete(struct mt76_dev *dev, struct sk_buff *skb);

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

+30 −0
Original line number Diff line number Diff line
@@ -438,6 +438,36 @@ int mt76x02_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
}

EXPORT_SYMBOL_GPL(mt76x02_conf_tx);



void mt76x02_set_tx_ackto(struct mt76x02_dev *dev)

{

	u8 ackto, sifs, slottime = dev->slottime;



	/* As defined by IEEE 802.11-2007 17.3.8.6 */

	slottime += 3 * dev->coverage_class;

	mt76_rmw_field(dev, MT_BKOFF_SLOT_CFG,

		       MT_BKOFF_SLOT_CFG_SLOTTIME, slottime);



	sifs = mt76_get_field(dev, MT_XIFS_TIME_CFG,

			      MT_XIFS_TIME_CFG_OFDM_SIFS);



	ackto = slottime + sifs;

	mt76_rmw_field(dev, MT_TX_TIMEOUT_CFG,

		       MT_TX_TIMEOUT_CFG_ACKTO, ackto);

}

EXPORT_SYMBOL_GPL(mt76x02_set_tx_ackto);



void mt76x02_set_coverage_class(struct ieee80211_hw *hw,

				s16 coverage_class)

{

	struct mt76x02_dev *dev = hw->priv;



	mutex_lock(&dev->mt76.mutex);

	dev->coverage_class = coverage_class;

	mt76x02_set_tx_ackto(dev);

	mutex_unlock(&dev->mt76.mutex);

}

EXPORT_SYMBOL_GPL(mt76x02_set_coverage_class);



void mt76x02_sta_rate_tbl_update(struct ieee80211_hw *hw,

				struct ieee80211_vif *vif,

				struct ieee80211_sta *sta)

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

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ int mt76x2_init_hardware(struct mt76x02_dev *dev); 
void mt76x2_stop_hardware(struct mt76x02_dev *dev);

int mt76x2_eeprom_init(struct mt76x02_dev *dev);

int mt76x2_apply_calibration_data(struct mt76x02_dev *dev, int channel);

void mt76x2_set_tx_ackto(struct mt76x02_dev *dev);



void mt76x2_phy_set_antenna(struct mt76x02_dev *dev);

int mt76x2_phy_start(struct mt76x02_dev *dev);