diff options
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/smsc911x.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index ccdd196f5297..6a9f51d1d9f2 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c | |||
| @@ -2071,6 +2071,9 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) | |||
| 2071 | if (is_valid_ether_addr(dev->dev_addr)) { | 2071 | if (is_valid_ether_addr(dev->dev_addr)) { |
| 2072 | smsc911x_set_hw_mac_address(pdata, dev->dev_addr); | 2072 | smsc911x_set_hw_mac_address(pdata, dev->dev_addr); |
| 2073 | SMSC_TRACE(PROBE, "MAC Address is specified by configuration"); | 2073 | SMSC_TRACE(PROBE, "MAC Address is specified by configuration"); |
| 2074 | } else if (is_valid_ether_addr(pdata->config.mac)) { | ||
| 2075 | memcpy(dev->dev_addr, pdata->config.mac, 6); | ||
| 2076 | SMSC_TRACE(PROBE, "MAC Address specified by platform data"); | ||
| 2074 | } else { | 2077 | } else { |
| 2075 | /* Try reading mac address from device. if EEPROM is present | 2078 | /* Try reading mac address from device. if EEPROM is present |
| 2076 | * it will already have been set */ | 2079 | * it will already have been set */ |