Author: blogic Date: 2015-01-28 20:19:47 +0100 (Wed, 28 Jan 2015) New Revision: 44183
Modified: trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-615-c1.c Log: ar71xx: fix D-Link DIR-615 rev. C1 WLAN MAC address 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 <[email protected]> Modified: trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-615-c1.c =================================================================== --- trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-615-c1.c 2015-01-28 19:19:33 UTC (rev 44182) +++ trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-615-c1.c 2015-01-28 19:19:47 UTC (rev 44183) @@ -38,6 +38,8 @@ #define DIR_615C1_CONFIG_ADDR 0x1f020000 #define DIR_615C1_CONFIG_SIZE 0x10000 +#define DIR_615C1_WLAN_MAC_ADDR 0x1f3fffb4 + static struct gpio_led dir_615c1_leds_gpio[] __initdata = { { .name = "d-link:orange:status", @@ -96,16 +98,16 @@ { const char *config = (char *) KSEG1ADDR(DIR_615C1_CONFIG_ADDR); u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000); - u8 mac[6]; - u8 *wlan_mac = NULL; + u8 mac[ETH_ALEN], wlan_mac[ETH_ALEN]; if (ath79_nvram_parse_mac_addr(config, DIR_615C1_CONFIG_SIZE, "lan_mac=", mac) == 0) { ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0); 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_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
