From 769ec19551a1244d1e0eb56dd1976ce7d44b9fe5 Mon Sep 17 00:00:00 2001
From: Bernard Blackham <bernard@largestprime.net>
Date: Mon, 18 Oct 2010 13:16:39 +0000
Subject: [PATCH] --- yaml --- r: 215415 b: refs/heads/master c:
 f4e8ab7cc4e819011ca6325e54383b3da7a5d130 h: refs/heads/master i:   215413:
 1eaf94a13899563672c82458b536b9e26980eeec   215411:
 935f22cb7ef205e3081e1e59e8ec21b0268b2ac8   215407:
 1e59f982bc983e9db569681b58b1c2e88dfd80ff v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/usb/smsc95xx.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8d686ca4d3aa..962fc65aff6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdb246f526e422b18b48d578085c01ab28ec2c33
+refs/heads/master: f4e8ab7cc4e819011ca6325e54383b3da7a5d130
diff --git a/trunk/drivers/net/usb/smsc95xx.c b/trunk/drivers/net/usb/smsc95xx.c
index 12a3c88c5282..65cb1abfbe57 100644
--- a/trunk/drivers/net/usb/smsc95xx.c
+++ b/trunk/drivers/net/usb/smsc95xx.c
@@ -805,8 +805,6 @@ static int smsc95xx_reset(struct usbnet *dev)
 		return ret;
 	}
 
-	smsc95xx_init_mac_address(dev);
-
 	ret = smsc95xx_set_mac_address(dev);
 	if (ret < 0)
 		return ret;
@@ -1047,6 +1045,8 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf)
 	pdata->use_tx_csum = DEFAULT_TX_CSUM_ENABLE;
 	pdata->use_rx_csum = DEFAULT_RX_CSUM_ENABLE;
 
+	smsc95xx_init_mac_address(dev);
+
 	/* Init all registers */
 	ret = smsc95xx_reset(dev);