diff --git a/[refs] b/[refs] index a5d6db719368..0583822a7a0b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86a74ff21a7ac4bc06b18076ddb0347712b46cfd +refs/heads/master: d1d5741d8568c268ec234a5b35af4a04498be6d8 diff --git a/trunk/drivers/net/macb.c b/trunk/drivers/net/macb.c index 92dccd43bdca..e34630252cef 100644 --- a/trunk/drivers/net/macb.c +++ b/trunk/drivers/net/macb.c @@ -80,8 +80,12 @@ static void __init macb_get_hwaddr(struct macb *bp) addr[4] = top & 0xff; addr[5] = (top >> 8) & 0xff; - if (is_valid_ether_addr(addr)) + if (is_valid_ether_addr(addr)) { memcpy(bp->dev->dev_addr, addr, sizeof(addr)); + } else { + dev_info(&bp->pdev->dev, "invalid hw address, using random\n"); + random_ether_addr(bp->dev->dev_addr); + } } static int macb_mdio_read(struct mii_bus *bus, int mii_id, int regnum)