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

Commit 9766cb70 authored by Mathias Kresin's avatar Mathias Kresin Committed by Kalle Valo
Browse files

rt2x00: add support for mac addr from device tree 



On some devices the EEPROMs of Ralink Wi-Fi chips have a default Ralink
MAC address set (RT3062F: 00:0C:43:30:62:00, RT3060F:
00:0C:43:30:60:00). Using multiple of these devices in the same network
can cause nasty issues.

Allow to override the MAC in the EEPROM with (a known good) one set in
the device tree to bypass the issue.

Signed-off-by: default avatarMathias Kresin <dev@kresin.me>
Acked-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent b9824cb8

drivers/net/wireless/ralink/rt2x00/rt2400pci.c

+1 −4
Original line number Diff line number Diff line
@@ -1459,10 +1459,7 @@ static int rt2400pci_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
	 * Start validation of the data that has been read.

	 */

	mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);

	if (!is_valid_ether_addr(mac)) {

		eth_random_addr(mac);

		rt2x00_eeprom_dbg(rt2x00dev, "MAC: %pM\n", mac);

	}

	rt2x00lib_set_mac_address(rt2x00dev, mac);



	rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);

	if (word == 0xffff) {

drivers/net/wireless/ralink/rt2x00/rt2500pci.c

+1 −4
Original line number Diff line number Diff line
@@ -1585,10 +1585,7 @@ static int rt2500pci_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
	 * Start validation of the data that has been read.

	 */

	mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);

	if (!is_valid_ether_addr(mac)) {

		eth_random_addr(mac);

		rt2x00_eeprom_dbg(rt2x00dev, "MAC: %pM\n", mac);

	}

	rt2x00lib_set_mac_address(rt2x00dev, mac);



	rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);

	if (word == 0xffff) {

drivers/net/wireless/ralink/rt2x00/rt2500usb.c

+1 −4
Original line number Diff line number Diff line
@@ -1349,10 +1349,7 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
	 * Start validation of the data that has been read.

	 */

	mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);

	if (!is_valid_ether_addr(mac)) {

		eth_random_addr(mac);

		rt2x00_eeprom_dbg(rt2x00dev, "MAC: %pM\n", mac);

	}

	rt2x00lib_set_mac_address(rt2x00dev, mac);



	rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);

	if (word == 0xffff) {

drivers/net/wireless/ralink/rt2x00/rt2800lib.c

+1 −4
Original line number Diff line number Diff line
@@ -6919,10 +6919,7 @@ static int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
	 * Start validation of the data that has been read.

	 */

	mac = rt2800_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);

	if (!is_valid_ether_addr(mac)) {

		eth_random_addr(mac);

		rt2x00_eeprom_dbg(rt2x00dev, "MAC: %pM\n", mac);

	}

	rt2x00lib_set_mac_address(rt2x00dev, mac);



	rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &word);

	if (word == 0xffff) {

drivers/net/wireless/ralink/rt2x00/rt2x00.h

+1 −0
Original line number Diff line number Diff line
@@ -1403,6 +1403,7 @@ static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev, 
 */

u32 rt2x00lib_get_bssidx(struct rt2x00_dev *rt2x00dev,

			 struct ieee80211_vif *vif);

void rt2x00lib_set_mac_address(struct rt2x00_dev *rt2x00dev, u8 *eeprom_mac_addr);



/*

 * Interrupt context handlers.