Commit 693d0605 authored Nov 24, 2019 by Lorenzo Bianconi Committed by Kalle Valo Dec 02, 2019

mt76: mt76x0: fix default mac address overwrite



Current implementation always use default eeprom mac address to
configure device registers even if it is updated using
mt76_eeprom_override. Fix it initializing macaddr filed of mt76_dev data
structure with eeprom mac address and running mt76_eeprom_override
before mt76x02_mac_setaddr

Fixes: d1bc9bf2 ("mt76: mt76x0: eeprom: add support for MAC address from OF")
Tested-by: Kevin Schmidt <kevin.patrick.schmidt@googlemail.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

parent 22d0d5ae

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -342,8 +342,11 @@ int mt76x0_eeprom_init(struct mt76x02_dev *dev)
		dev_info(dev->mt76.dev, "EEPROM ver:%02hhx fae:%02hhx\n",
		version, fae);

		mt76x02_mac_setaddr(dev, dev->mt76.eeprom.data + MT_EE_MAC_ADDR);
		memcpy(dev->mt76.macaddr, (u8 *)dev->mt76.eeprom.data + MT_EE_MAC_ADDR,
		ETH_ALEN);
		mt76_eeprom_override(&dev->mt76);
		mt76x02_mac_setaddr(dev, dev->mt76.macaddr);

		mt76x0_set_chip_cap(dev);
		mt76x0_set_freq_offset(dev);
		mt76x0_set_temp_offset(dev);

Admin message