mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
asix: use ramdom hw addr if the one read is not valid
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: linux-usb@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
93272e07d8
commit
452b5ecda0
1 changed files with 16 additions and 3 deletions
|
@ -64,6 +64,16 @@ static void asix_status(struct usbnet *dev, struct urb *urb)
|
|||
}
|
||||
}
|
||||
|
||||
static void asix_set_netdev_dev_addr(struct usbnet *dev, u8 *addr)
|
||||
{
|
||||
if (is_valid_ether_addr(addr)) {
|
||||
memcpy(dev->net->dev_addr, addr, ETH_ALEN);
|
||||
} else {
|
||||
netdev_info(dev->net, "invalid hw address, using random\n");
|
||||
eth_hw_addr_random(dev->net);
|
||||
}
|
||||
}
|
||||
|
||||
/* Get the PHY Identifier from the PHYSID1 & PHYSID2 MII registers */
|
||||
static u32 asix_get_phyid(struct usbnet *dev)
|
||||
{
|
||||
|
@ -225,7 +235,8 @@ static int ax88172_bind(struct usbnet *dev, struct usb_interface *intf)
|
|||
ret);
|
||||
goto out;
|
||||
}
|
||||
memcpy(dev->net->dev_addr, buf, ETH_ALEN);
|
||||
|
||||
asix_set_netdev_dev_addr(dev, buf);
|
||||
|
||||
/* Initialize MII structure */
|
||||
dev->mii.dev = dev->net;
|
||||
|
@ -423,7 +434,8 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
|
|||
netdev_dbg(dev->net, "Failed to read MAC address: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
memcpy(dev->net->dev_addr, buf, ETH_ALEN);
|
||||
|
||||
asix_set_netdev_dev_addr(dev, buf);
|
||||
|
||||
/* Initialize MII structure */
|
||||
dev->mii.dev = dev->net;
|
||||
|
@ -777,7 +789,8 @@ static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)
|
|||
netdev_dbg(dev->net, "Failed to read MAC address: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
memcpy(dev->net->dev_addr, buf, ETH_ALEN);
|
||||
|
||||
asix_set_netdev_dev_addr(dev, buf);
|
||||
|
||||
/* Initialize MII structure */
|
||||
dev->mii.dev = dev->net;
|
||||
|
|
Loading…
Reference in a new issue