diff --git a/[refs] b/[refs] index 675a6edff4f4..e79ffd39f900 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5e67305885eb12849b5475764b0542f03dc2b59 +refs/heads/master: d166f218ff2bae0f6adae9ce5444a889a1d749e2 diff --git a/trunk/drivers/net/ethernet/broadcom/bgmac.c b/trunk/drivers/net/ethernet/broadcom/bgmac.c index 23c8d4a21ccf..380084bad129 100644 --- a/trunk/drivers/net/ethernet/broadcom/bgmac.c +++ b/trunk/drivers/net/ethernet/broadcom/bgmac.c @@ -1318,6 +1318,12 @@ static int bgmac_probe(struct bcma_device *core) return -ENOTSUPP; } + if (!is_valid_ether_addr(mac)) { + dev_err(&core->dev, "Invalid MAC addr: %pM\n", mac); + eth_random_addr(mac); + dev_warn(&core->dev, "Using random MAC: %pM\n", mac); + } + /* Allocation and references */ net_dev = alloc_etherdev(sizeof(*bgmac)); if (!net_dev)