@@ -266,7 +266,7 @@ static struct gpio_keys_button wnr2000v3
}
};
-static void __init wnr_common_setup(void)
+static void __init wnr_common_setup(u8 *wmac_addr)
{
u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
@@ -285,12 +285,15 @@ static void __init wnr_common_setup(void
ath79_register_eth(1);
ath79_register_m25p80(NULL);
- ap91_pci_init(art + WNR2000V3_PCIE_CALDATA_OFFSET, NULL);
+ ap91_pci_init(art + WNR2000V3_PCIE_CALDATA_OFFSET, wmac_addr);
}
static void __init wnr2000v3_setup(void)
{
- wnr_common_setup();
+ u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+ u8 wlan_mac_addr[6];
+ u8 *eth0_mac_addr = (u8 *) (art + WNR2000V3_MAC0_OFFSET);
+ u8 *eth1_mac_addr = (u8 *) (art + WNR2000V3_MAC1_OFFSET);
/*
* Disable JTAG to use all AR724X GPIO LEDs.
@@ -312,6 +315,21 @@ static void __init wnr2000v3_setup(void)
AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN |
BIT(20));
+ /*
+ * For WNR2000v3 ART flash area used for wlan MAC is usually empty (0xff)
+ * so ath9k driver uses random MAC instead each time module is loaded.
+ * To fix that, assign permanent wlan MAC equal to ethN's MAC plus 1,
+ * so network interfaces get sequential addresses.
+ */
+ memcpy(wlan_mac_addr, eth0_mac_addr, sizeof(wlan_mac_addr));
+ wlan_mac_addr[5] = (eth0_mac_addr[5] > eth1_mac_addr[5] ?
+ eth0_mac_addr[5] : eth1_mac_addr[5]) + 1;
+
+ /* avoid potential conflict in case: max(0xff,0x00)+1==0x00 */
+ if (!wlan_mac_addr[5]) wlan_mac_addr[5] = 1;
+
+ wnr_common_setup(wlan_mac_addr);
+
ath79_register_leds_gpio(-1, ARRAY_SIZE(wnr2000v3_leds_gpio),
wnr2000v3_leds_gpio);
@@ -336,7 +354,7 @@ MIPS_MACHINE(ATH79_MACH_WNR2000_V3, "WNR
static void __init wnr612v2_setup(void)
{
- wnr_common_setup();
+ wnr_common_setup(NULL);
ath79_register_leds_gpio(-1, ARRAY_SIZE(wnr612v2_leds_gpio),
wnr612v2_leds_gpio);
@@ -346,7 +364,7 @@ MIPS_MACHINE(ATH79_MACH_WNR612_V2, "WNR6
static void __init wnr1000v2_setup(void)
{
- wnr_common_setup();
+ wnr_common_setup(NULL);
ath79_register_leds_gpio(-1, ARRAY_SIZE(wnr1000v2_leds_gpio),
wnr1000v2_leds_gpio);
@@ -364,7 +382,7 @@ static void __init wpn824n_setup(void)
AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN |
AR724X_GPIO_FUNC_CLK_OBS3_EN);
- wnr_common_setup();
+ wnr_common_setup(NULL);
ath79_register_leds_gpio(-1, ARRAY_SIZE(wpn824n_leds_gpio),
wpn824n_leds_gpio);