diff options
| author | Wu Fengguang <fengguang.wu@intel.com> | 2009-01-06 10:55:10 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-06 10:55:32 -0800 |
| commit | 20f10aa07d8d4d43ae8e129c39a84e1670b0d5ab (patch) | |
| tree | db283b501631fbf6d21b402c580d7dc86809a4a4 | |
| parent | e1c096e251e52773afeffbbcb74d0a072be47ea3 (diff) | |
| download | linux-20f10aa07d8d4d43ae8e129c39a84e1670b0d5ab.tar.gz linux-20f10aa07d8d4d43ae8e129c39a84e1670b0d5ab.tar.bz2 linux-20f10aa07d8d4d43ae8e129c39a84e1670b0d5ab.zip | |
dm9601: handle corrupt mac address
Some cheap devices ship with dangling EEPROM pins!
They always return invalid address ff:ff:ff:ff:ff:ff.
Inherit the auto-generated address in this case,
so that these products can work with zero configuration.
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/usb/dm9601.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c index edd244f3acb5..69a0436d3940 100644 --- a/drivers/net/usb/dm9601.c +++ b/drivers/net/usb/dm9601.c @@ -414,6 +414,7 @@ static int dm9601_set_mac_address(struct net_device *net, void *p) static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf) { int ret; + u8 mac[ETH_ALEN]; ret = usbnet_get_endpoints(dev, intf); if (ret) @@ -438,12 +439,18 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf) udelay(20); /* read MAC */ - if (dm_read(dev, DM_PHY_ADDR, ETH_ALEN, dev->net->dev_addr) < 0) { + if (dm_read(dev, DM_PHY_ADDR, ETH_ALEN, mac) < 0) { printk(KERN_ERR "Error reading MAC address\n"); ret = -ENODEV; goto out; } + /* + * Overwrite the auto-generated address only with good ones. + */ + if (is_valid_ether_addr(mac)) + memcpy(dev->net->dev_addr, mac, ETH_ALEN); + /* power up phy */ dm_write_reg(dev, DM_GPR_CTRL, 1); dm_write_reg(dev, DM_GPR_DATA, 0); |