aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-12-17 17:10:01 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-12-17 17:10:01 +0000
commit8390b7dc9b1dd45dfc3a605c92ba3ff03ff0ff59 (patch)
tree24a343c32b59de0157758f3c8ea4634b9e459626 /target/linux/ar71xx
parenta26c3e60e2a1424f3aff7b5353a3a60dd8e813e1 (diff)
downloadupstream-8390b7dc9b1dd45dfc3a605c92ba3ff03ff0ff59.tar.gz
upstream-8390b7dc9b1dd45dfc3a605c92ba3ff03ff0ff59.tar.bz2
upstream-8390b7dc9b1dd45dfc3a605c92ba3ff03ff0ff59.zip
ar71xx: UBNT Secondary MAC address duplicate fix
There is Secondary MAC address duplicate problem with some UBNT RouterStation and RouterStation Pro HW batches as Primary MAC addresses are not increased by 2 per device in board data. Fix is to use 'Locally Administrated bit' for Secondary MAC address instead of increasing Primary MAC addresses by 1 which could overlap with other device Primary MAC address. Signed-off-by: Kestutis Barkauskas<keba@devint.net> SVN-Revision: 24643
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r--target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
index feb913a63b..38095b2ea9 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
@@ -133,6 +133,17 @@ static void __init ubnt_generic_setup(void)
pb42_pci_init();
}
+/*
+ * There is Secondary MAC address duplicate problem with some UBNT HW batches.
+ * Do not increase Secondary MAC address by 1 but do workaround
+ * with 'Locally Administrated' bit.
+ */
+static void ubnt_init_secondary_mac(unsigned char *mac_base)
+{
+ ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac_base, 0);
+ ar71xx_eth1_data.mac_addr[0] |= 0x02;
+}
+
#define UBNT_RS_WAN_PHYMASK (1 << 20)
#define UBNT_RS_LAN_PHYMASK ((1 << 16) | (1 << 17) | (1 << 18) | (1 << 19))
@@ -146,7 +157,7 @@ static void __init ubnt_rs_setup(void)
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
ar71xx_eth0_data.phy_mask = UBNT_RS_WAN_PHYMASK;
- ar71xx_init_mac(ar71xx_eth1_data.mac_addr, ar71xx_mac_base, 1);
+ ubnt_init_secondary_mac(ar71xx_mac_base);
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth1_data.speed = SPEED_100;
ar71xx_eth1_data.duplex = DUPLEX_FULL;
@@ -177,7 +188,7 @@ static void __init ubnt_rspro_setup(void)
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
ar71xx_eth0_data.phy_mask = UBNT_RSPRO_WAN_PHYMASK;
- ar71xx_init_mac(ar71xx_eth1_data.mac_addr, ar71xx_mac_base, 1);
+ ubnt_init_secondary_mac(ar71xx_mac_base);
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
ar71xx_eth1_data.phy_mask = UBNT_RSPRO_LAN_PHYMASK;
ar71xx_eth1_data.speed = SPEED_1000;