X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5b74d557fa51ff9aa9e3e33883328798a96b1eed..e6e930942664682d11abe4ad7ccd0bada1afecfa:/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
index 3644b2dd9..4519ec8dc 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -415,12 +415,12 @@ static void ag71xx_hw_set_macaddr(struct ag71xx *ag, unsigned char *mac)
 {
 	u32 t;
 
-	t = (((u32) mac[0]) << 24) | (((u32) mac[1]) << 16)
-	  | (((u32) mac[2]) << 8) | ((u32) mac[3]);
+	t = (((u32) mac[5]) << 24) | (((u32) mac[4]) << 16)
+	  | (((u32) mac[3]) << 8) | ((u32) mac[2]);
 
 	ag71xx_wr(ag, AG71XX_REG_MAC_ADDR1, t);
 
-	t = (((u32) mac[4]) << 24) | (((u32) mac[5]) << 16);
+	t = (((u32) mac[1]) << 24) | (((u32) mac[0]) << 16);
 	ag71xx_wr(ag, AG71XX_REG_MAC_ADDR2, t);
 }
 
@@ -580,15 +580,15 @@ static int ag71xx_stop(struct net_device *dev)
 	struct ag71xx *ag = netdev_priv(dev);
 	unsigned long flags;
 
+	netif_carrier_off(dev);
+	ag71xx_phy_stop(ag);
+
 	spin_lock_irqsave(&ag->lock, flags);
 
 	netif_stop_queue(dev);
 
 	ag71xx_hw_stop(ag);
 
-	netif_carrier_off(dev);
-	ag71xx_phy_stop(ag);
-
 	napi_disable(&ag->napi);
 	del_timer_sync(&ag->oom_timer);