diff options
author | Manuel Lauss <manuel.lauss@googlemail.com> | 2009-10-13 03:25:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-13 14:48:32 -0400 |
commit | aace495933a981274b6491d71b915165a61defdc (patch) | |
tree | c6233d889f8c514f1bab538270676c97dd682739 /drivers | |
parent | b4efc5610980bc4b65a6cb49b939cf5f7dfa2723 (diff) |
net: smsc911x: allow platform_data to specify mac address
Extend the driver to accept a MAC address specified in platform_data.
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-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 */ |