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

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

mt76: introduce mt76x02_config_mac_addr_list routine 



Add mt76x02_config_mac_addr_list routine in order to set
the mac address list supported by the driver. Initialize
wiphy->addresses/n_addresses for mt76x0e driver

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

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

+2 −0
Original line number Diff line number Diff line
@@ -289,6 +289,8 @@ int mt76x0_register_device(struct mt76x02_dev *dev) 
	int ret;



	mt76x02_init_device(dev);

	mt76x02_config_mac_addr_list(dev);



	ret = mt76_register_device(&dev->mt76, true, mt76x02_rates,

				   ARRAY_SIZE(mt76x02_rates));

	if (ret)

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

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ int mt76x02_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
int mt76x02_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		      struct ieee80211_sta *sta);



void mt76x02_config_mac_addr_list(struct mt76x02_dev *dev);

void mt76x02_vif_init(struct mt76x02_dev *dev, struct ieee80211_vif *vif,

		      unsigned int idx);

int mt76x02_add_interface(struct ieee80211_hw *hw,

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

+22 −0
Original line number Diff line number Diff line
@@ -700,4 +700,26 @@ void mt76x02_bss_info_changed(struct ieee80211_hw *hw, 
}

EXPORT_SYMBOL_GPL(mt76x02_bss_info_changed);



void mt76x02_config_mac_addr_list(struct mt76x02_dev *dev)

{

	struct ieee80211_hw *hw = mt76_hw(dev);

	struct wiphy *wiphy = hw->wiphy;

	int i;



	for (i = 0; i < ARRAY_SIZE(dev->macaddr_list); i++) {

		u8 *addr = dev->macaddr_list[i].addr;



		memcpy(addr, dev->mt76.macaddr, ETH_ALEN);



		if (!i)

			continue;



		addr[0] |= BIT(1);

		addr[0] ^= ((i - 1) << 2);

	}

	wiphy->addresses = dev->macaddr_list;

	wiphy->n_addresses = ARRAY_SIZE(dev->macaddr_list);

}

EXPORT_SYMBOL_GPL(mt76x02_config_mac_addr_list);



MODULE_LICENSE("Dual BSD/GPL");

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

+2 −15
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ int mt76x2_register_device(struct mt76x02_dev *dev) 
{

	struct ieee80211_hw *hw = mt76_hw(dev);

	struct wiphy *wiphy = hw->wiphy;

	int i, ret;

	int ret;



	INIT_DELAYED_WORK(&dev->cal_work, mt76x2_phy_calibrate);
@@ -400,20 +400,7 @@ int mt76x2_register_device(struct mt76x02_dev *dev) 
	if (ret)

		return ret;



	for (i = 0; i < ARRAY_SIZE(dev->macaddr_list); i++) {

		u8 *addr = dev->macaddr_list[i].addr;



		memcpy(addr, dev->mt76.macaddr, ETH_ALEN);



		if (!i)

			continue;



		addr[0] |= BIT(1);

		addr[0] ^= ((i - 1) << 2);

	}

	wiphy->addresses = dev->macaddr_list;

	wiphy->n_addresses = ARRAY_SIZE(dev->macaddr_list);



	mt76x02_config_mac_addr_list(dev);

	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_VHT_IBSS);



	/* init led callbacks */