ar71xx: add v4.14 support

[openwrt/openwrt.git] / target / linux / ar71xx / files / arch / mips / ath79 / mach-esr900.c

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-esr900.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-esr900.c
index ca36e36114463519dfdd4e3721bfe19ca2e2afaf..cf2ee9295aecffc785f91bc5ecc4c0faa716379e 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-esr900.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-esr900.c
@@ -136,7 +136,7 @@ static struct ar8327_platform_data esr900_ar8327_data = {
 static struct mdio_board_info esr900_mdio0_info[] = {
        {
                .bus_id = "ag71xx-mdio.0",
-               .phy_addr = 0,
+               .mdio_addr = 0,
                .platform_data = &esr900_ar8327_data,
        },
 };
@@ -145,9 +145,9 @@ static void __init esr900_setup(void)
 {
        const char *config = (char *) KSEG1ADDR(ESR900_CONFIG_ADDR);
        u8 *art = (u8 *) KSEG1ADDR(ESR900_CALDATA_ADDR);
-       u8 lan_mac[6];
-       u8 wlan0_mac[6];
-       u8 wlan1_mac[6];
+       u8 lan_mac[ETH_ALEN];
+       u8 wlan0_mac[ETH_ALEN];
+       u8 wlan1_mac[ETH_ALEN];
 
        if (ath79_nvram_parse_mac_addr(config, ESR900_CONFIG_SIZE,
                                       "ethaddr=", lan_mac) == 0) {