Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / net / usb / smsc95xx.c

diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 12a3c88c52821fdfb44c05ca964ef3bb022ce3c4..65cb1abfbe577f304f390fe4b7dba650fb5b2574 100644 (file)
--- a/drivers/net/usb/smsc95xx.c
+++ b/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);