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

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

mt76: move mt76x02_mac_set_short_preamble in mt76x02_mac.c 



Move mt76x02_mac_set_short_preamble routine in mt76x02-lib module
since it is shared 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 f4730140

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

+0 −8
Original line number Diff line number Diff line
@@ -76,14 +76,6 @@ void mt76x0_mac_set_protection(struct mt76x02_dev *dev, bool legacy_prot, 
		mt76_wr(dev, MT_CCK_PROT_CFG + i * 4, prot[i]);

}



void mt76x0_mac_set_short_preamble(struct mt76x02_dev *dev, bool short_preamb)

{

	if (short_preamb)

		mt76_set(dev, MT_AUTO_RSP_CFG, MT_AUTO_RSP_PREAMB_SHORT);

	else

		mt76_clear(dev, MT_AUTO_RSP_CFG, MT_AUTO_RSP_PREAMB_SHORT);

}



void mt76x0_mac_config_tsf(struct mt76x02_dev *dev, bool enable, int interval)

{

	u32 val = mt76_rr(dev, MT_BEACON_TIME_CFG);

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

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ void mt76x0_bss_info_changed(struct ieee80211_hw *hw, 
					   info->ht_operation_mode);



	if (changed & BSS_CHANGED_ERP_PREAMBLE)

		mt76x0_mac_set_short_preamble(dev, info->use_short_preamble);

		mt76x02_mac_set_short_preamble(dev, info->use_short_preamble);



	if (changed & BSS_CHANGED_ERP_SLOT) {

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

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

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ void mt76x0_phy_calibrate(struct mt76x02_dev *dev, bool power_on); 
/* MAC */

void mt76x0_mac_set_protection(struct mt76x02_dev *dev, bool legacy_prot,

				int ht_mode);

void mt76x0_mac_set_short_preamble(struct mt76x02_dev *dev, bool short_preamb);

void mt76x0_mac_config_tsf(struct mt76x02_dev *dev, bool enable, int interval);



#endif

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

+9 −0
Original line number Diff line number Diff line
@@ -213,6 +213,15 @@ void mt76x02_mac_wcid_set_rate(struct mt76x02_dev *dev, struct mt76_wcid *wcid, 
	spin_unlock_bh(&dev->mt76.lock);

}



void mt76x02_mac_set_short_preamble(struct mt76x02_dev *dev, bool enable)

{

	if (enable)

		mt76_set(dev, MT_AUTO_RSP_CFG, MT_AUTO_RSP_PREAMB_SHORT);

	else

		mt76_clear(dev, MT_AUTO_RSP_CFG, MT_AUTO_RSP_PREAMB_SHORT);

}

EXPORT_SYMBOL_GPL(mt76x02_mac_set_short_preamble);



bool mt76x02_mac_load_tx_status(struct mt76x02_dev *dev,

				struct mt76x02_tx_status *stat)

{

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

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ mt76x02_skb_tx_info(struct sk_buff *skb) 


void mt76x02_txq_init(struct mt76x02_dev *dev, struct ieee80211_txq *txq);



void mt76x02_mac_set_short_preamble(struct mt76x02_dev *dev, bool enable);

int mt76x02_mac_shared_key_setup(struct mt76x02_dev *dev, u8 vif_idx,

				 u8 key_idx, struct ieee80211_key_conf *key);

int mt76x02_mac_wcid_set_key(struct mt76x02_dev *dev, u8 idx,