KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: fix D-Link DIR-615 rev. C1 WLAN MAC address

Browse source 
Fix the WLAN MAC address to match the one printed on the label by using the
correct address from the ART instead of the address of the LAN interface.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>

SVN-Revision: 44183
This commit is contained in:
John Crispin 2015-01-28 19:19:47 +00:00
parent 623716dd43
commit 259244624b
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
target/linux/ar71xx/files/arch/mips/ath79/mach-dir-615-c1.c
View file

@ -38,6 +38,8 @@
#define DIR_615C1_CONFIG_ADDR 0x1f020000 #define DIR_615C1_CONFIG_ADDR 0x1f020000
#define DIR_615C1_CONFIG_SIZE 0x10000 #define DIR_615C1_CONFIG_SIZE 0x10000
#define DIR_615C1_WLAN_MAC_ADDR 0x1f3fffb4
static struct gpio_led dir_615c1_leds_gpio[] __initdata = { static struct gpio_led dir_615c1_leds_gpio[] __initdata = {
{ {
.name = "d-link:orange:status", .name = "d-link:orange:status",
@ -96,16 +98,16 @@ static void __init dir_615c1_setup(void)
{ {
const char *config = (char *) KSEG1ADDR(DIR_615C1_CONFIG_ADDR); const char *config = (char *) KSEG1ADDR(DIR_615C1_CONFIG_ADDR);
u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000); u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
u8 mac[6]; u8 mac[ETH_ALEN], wlan_mac[ETH_ALEN];
u8 *wlan_mac = NULL;
if (ath79_nvram_parse_mac_addr(config, DIR_615C1_CONFIG_SIZE, if (ath79_nvram_parse_mac_addr(config, DIR_615C1_CONFIG_SIZE,
"lan_mac=", mac) == 0) { "lan_mac=", mac) == 0) {
ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0); ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
ath79_init_mac(ath79_eth1_data.mac_addr, mac, 1); ath79_init_mac(ath79_eth1_data.mac_addr, mac, 1);
wlan_mac = mac;
} }
ath79_parse_ascii_mac((char *) KSEG1ADDR(DIR_615C1_WLAN_MAC_ADDR), wlan_mac);
ath79_register_mdio(0, DIR_615C1_MDIO_MASK); ath79_register_mdio(0, DIR_615C1_MDIO_MASK);
ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII; ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;