aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/atheros-2.6
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2007-02-08 13:19:34 +0000
committerImre Kaloz <kaloz@openwrt.org>2007-02-08 13:19:34 +0000
commit773ea5684c87cc803d1a5f73a3e92721c6d73783 (patch)
treebb569410aa803efe2ad67c8ebab24880f7188ea1 /target/linux/atheros-2.6
parent4d9aa791d89f22de11eebb28cbc2207702f1c76b (diff)
downloadupstream-773ea5684c87cc803d1a5f73a3e92721c6d73783.tar.gz
upstream-773ea5684c87cc803d1a5f73a3e92721c6d73783.tar.bz2
upstream-773ea5684c87cc803d1a5f73a3e92721c6d73783.zip
fix mac handling, thanks to Kestutis Kupciunas
SVN-Revision: 6278
Diffstat (limited to 'target/linux/atheros-2.6')
-rw-r--r--target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313.c b/target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313.c
index 82e9e94d5c..bf62c78b13 100644
--- a/target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313.c
+++ b/target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313.c
@@ -296,7 +296,10 @@ int __init ar2313_probe(struct platform_device *pdev)
memcpy(dev->dev_addr, def_mac, 6);
} else {
memcpy(dev->dev_addr, ((u8 *)configstart)+102, 6);
- }
+ /* use the other MAC slot if the first one is empty */
+ if (!memcmp(dev->dev_addr, "\xff\xff\xff\xff\xff\xff", 6))
+ memcpy(dev->dev_addr, ((u8 *)configstart)+102 + 6, 6);
+ }
}
sp->board_idx = BOARD_IDX_STATIC;