---

yaml --- r: 215415 b: refs/heads/master c: f4e8ab7 h: refs/heads/master i: 215413: 1eaf94a 215411: 935f22c 215407: 1e59f98 v: v3
git-mirror · Oct 21, 2010 · 769ec19 · 769ec19
1 parent a20dc20
commit 769ec19
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);