diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-17 17:10:01 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-17 17:10:01 +0000 |
| commit | 579e608a9b94b75b83477abf173cd562779d9b41 (patch) | |
| tree | 5b3c0bbd4b5b69020169eab71cdce0f29c2b369d | |
| parent | 84ea49f558f72ce6de6365fd20856a148615e294 (diff) | |
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24643 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c | 15 |
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 feb913a63..38095b2ea 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; |