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

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

mt76: move mt76x02_bss_info_changed in mt76x02-lib module 



Unify drv_bss_info_changed mac80211 callback and remove duplicated
code in mt76x0 and mt76x2 drivers

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

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

+0 −49
Original line number Diff line number Diff line
@@ -71,52 +71,3 @@ int mt76x0_config(struct ieee80211_hw *hw, u32 changed) 
	return ret;

}

EXPORT_SYMBOL_GPL(mt76x0_config);
 


void mt76x0_bss_info_changed(struct ieee80211_hw *hw,

			     struct ieee80211_vif *vif,

			     struct ieee80211_bss_conf *info, u32 changed)

{

	struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif->drv_priv;

	struct mt76x02_dev *dev = hw->priv;



	mutex_lock(&dev->mt76.mutex);



	if (changed & BSS_CHANGED_BSSID)

		mt76x02_mac_set_bssid(dev, mvif->idx, info->bssid);



	if (changed & BSS_CHANGED_BEACON_ENABLED) {

		tasklet_disable(&dev->pre_tbtt_tasklet);

		mt76x02_mac_set_beacon_enable(dev, mvif->idx,

					      info->enable_beacon);

		tasklet_enable(&dev->pre_tbtt_tasklet);

	}



	if (changed & BSS_CHANGED_BASIC_RATES) {

		mt76_wr(dev, MT_LEGACY_BASIC_RATE, info->basic_rates);

		mt76_wr(dev, MT_VHT_HT_FBK_CFG0, 0x65432100);

		mt76_wr(dev, MT_VHT_HT_FBK_CFG1, 0xedcba980);

		mt76_wr(dev, MT_LG_FBK_CFG0, 0xedcba988);

		mt76_wr(dev, MT_LG_FBK_CFG1, 0x00002100);

	}



	if (changed & BSS_CHANGED_BEACON_INT) {

		mt76_rmw_field(dev, MT_BEACON_TIME_CFG,

			       MT_BEACON_TIME_CFG_INTVAL,

			       info->beacon_int << 4);

		dev->beacon_int = info->beacon_int;

		dev->tbtt_count = 0;

	}



	if (changed & BSS_CHANGED_ERP_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;



		dev->slottime = slottime;

		mt76x02_set_tx_ackto(dev);

	}



	mutex_unlock(&dev->mt76.mutex);

}

EXPORT_SYMBOL_GPL(mt76x0_bss_info_changed);

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

+0 −3
Original line number Diff line number Diff line
@@ -62,9 +62,6 @@ int mt76x0_mac_start(struct mt76x02_dev *dev); 
void mt76x0_mac_stop(struct mt76x02_dev *dev);



int mt76x0_config(struct ieee80211_hw *hw, u32 changed);

void mt76x0_bss_info_changed(struct ieee80211_hw *hw,

			     struct ieee80211_vif *vif,

			     struct ieee80211_bss_conf *info, u32 changed);



/* PHY */

void mt76x0_phy_init(struct mt76x02_dev *dev);

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

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static const struct ieee80211_ops mt76x0e_ops = { 
	.remove_interface = mt76x02_remove_interface,

	.config = mt76x0_config,

	.configure_filter = mt76x02_configure_filter,

	.bss_info_changed = mt76x0_bss_info_changed,

	.bss_info_changed = mt76x02_bss_info_changed,

	.sta_add = mt76x02_sta_add,

	.sta_remove = mt76x02_sta_remove,

	.set_key = mt76x02_set_key,

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

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static const struct ieee80211_ops mt76x0u_ops = { 
	.remove_interface = mt76x02_remove_interface,

	.config = mt76x0_config,

	.configure_filter = mt76x02_configure_filter,

	.bss_info_changed = mt76x0_bss_info_changed,

	.bss_info_changed = mt76x02_bss_info_changed,

	.sta_add = mt76x02_sta_add,

	.sta_remove = mt76x02_sta_remove,

	.set_key = mt76x02_set_key,

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

+3 −0
Original line number Diff line number Diff line
@@ -158,6 +158,9 @@ void mt76x02_sw_scan_complete(struct ieee80211_hw *hw, 
int mt76x02_get_txpower(struct ieee80211_hw *hw,

			struct ieee80211_vif *vif, int *dbm);

void mt76x02_sta_ps(struct mt76_dev *dev, struct ieee80211_sta *sta, bool ps);

void mt76x02_bss_info_changed(struct ieee80211_hw *hw,

			      struct ieee80211_vif *vif,

			      struct ieee80211_bss_conf *info, u32 changed);



extern const u16 mt76x02_beacon_offsets[16];

void mt76x02_init_beacon_config(struct mt76x02_dev *dev);