diff options
| author | Manuel Lauss <manuel.lauss@googlemail.com> | 2009-10-13 09:25:49 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-13 20:48:32 +0200 |
| commit | aace495933a981274b6491d71b915165a61defdc (patch) | |
| tree | c6233d889f8c514f1bab538270676c97dd682739 /drivers/net/smsc911x.c | |
| parent | net: enable smsc911x on MIPS (diff) | |
| download | linux-aace495933a981274b6491d71b915165a61defdc.tar.xz linux-aace495933a981274b6491d71b915165a61defdc.zip | |
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/net/smsc911x.c')
| -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) if (is_valid_ether_addr(dev->dev_addr)) { smsc911x_set_hw_mac_address(pdata, dev->dev_addr); SMSC_TRACE(PROBE, "MAC Address is specified by configuration"); + } else if (is_valid_ether_addr(pdata->config.mac)) { + memcpy(dev->dev_addr, pdata->config.mac, 6); + SMSC_TRACE(PROBE, "MAC Address specified by platform data"); } else { /* Try reading mac address from device. if EEPROM is present * it will already have been set */ |