From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 28 Dec 2008 01:22:15 +0000 (+0000)
Subject: merge r13753 to 8.09
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=2e0edba897f3380ea573b8a86c81dfeddc27f941

merge r13753 to 8.09

SVN-Revision: 13754
---

diff --git a/target/linux/atheros/files/drivers/net/ar2313/ar2313.c b/target/linux/atheros/files/drivers/net/ar2313/ar2313.c
index 995325a913..727d190b37 100644
--- a/target/linux/atheros/files/drivers/net/ar2313/ar2313.c
+++ b/target/linux/atheros/files/drivers/net/ar2313/ar2313.c
@@ -1120,9 +1120,21 @@ static irqreturn_t ar2313_interrupt(int irq, void *dev_id)
 static int ar2313_open(struct net_device *dev)
 {
 	struct ar2313_private *sp = netdev_priv(dev);
+	unsigned int ethsal, ethsah;
 
 	/* reset the hardware, in case the MAC address changed */
-	ar2313_reset_reg(dev);
+	ethsah = ((((u_int) (dev->dev_addr[5]) << 8) & (u_int) 0x0000FF00) |
+			  (((u_int) (dev->dev_addr[4]) << 0) & (u_int) 0x000000FF));
+
+	ethsal = ((((u_int) (dev->dev_addr[3]) << 24) & (u_int) 0xFF000000) |
+			  (((u_int) (dev->dev_addr[2]) << 16) & (u_int) 0x00FF0000) |
+			  (((u_int) (dev->dev_addr[1]) << 8) & (u_int) 0x0000FF00) |
+			  (((u_int) (dev->dev_addr[0]) << 0) & (u_int) 0x000000FF));
+
+	sp->eth_regs->mac_addr[0] = ethsah;
+	sp->eth_regs->mac_addr[1] = ethsal;
+
+	mdelay(10);
 
 	dev->mtu = 1500;
 	netif_start_queue(dev);