From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 17 Feb 2007 22:22:14 +0000 (+0000)
Subject: fix ar2312/2313 mac detection
X-Git-Tag: reboot~29924
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=73fc1141c007cc89f820c24a882c665c56b95252;p=oweals%2Fopenwrt.git

fix ar2312/2313 mac detection

SVN-Revision: 6316
---

diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/ar5312.c b/target/linux/atheros-2.6/files/arch/mips/atheros/ar5312.c
index d337098d5c..11f21fe5c0 100644
--- a/target/linux/atheros-2.6/files/arch/mips/atheros/ar5312.c
+++ b/target/linux/atheros-2.6/files/arch/mips/atheros/ar5312.c
@@ -255,8 +255,9 @@ int __init ar5312_init_devices(void)
 	ar5312_eth1_data.board_config = board_config;
 	ar5312_devs[dev++] = &ar5312_physmap_flash;
 
-	ar5312_eth0_data.macaddr = bcfg->enet0Mac;
-	ar5312_eth1_data.macaddr = bcfg->enet1Mac;
+	if (!memcmp(bcfg->enet0Mac, "\xff\xff\xff\xff\xff\xff", 6))
+		memcpy(bcfg->enet0Mac, bcfg->enet1Mac, 6);
+
 	if (memcmp(bcfg->enet0Mac, bcfg->enet1Mac, 6) == 0) {
 		/* ENET0 and ENET1 have the same mac.
 		 * Increment the one from ENET1 */
@@ -267,11 +268,14 @@ int __init ar5312_init_devices(void)
 
 	switch(mips_machtype) {
 		case MACH_ATHEROS_AR5312:
+			ar5312_eth0_data.macaddr = bcfg->enet0Mac;
+			ar5312_eth1_data.macaddr = bcfg->enet1Mac;
 			ar5312_devs[dev++] = &ar5312_eth[0];
 			ar5312_devs[dev++] = &ar5312_eth[1];
 			break;
 		case MACH_ATHEROS_AR2312:
 		case MACH_ATHEROS_AR2313:
+			ar231x_eth0_data.macaddr = bcfg->enet0Mac;
 			ar5312_devs[dev++] = &ar231x_eth0;
 			ar5312_flash_data.width = 1;
 			break;