diff options
| author |   Liviu Dudau <Liviu.Dudau@arm.com> | 2015-09-28 17:51:51 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-09-29 15:00:04 -0700 |
| commit | 0f50c10d2683fd2b8a3908c779c5f29bcb3c2174 (patch) | |
| tree | a132e3d4f9d3d04a05bccaed8b3d7874613b7a91 /drivers/net/ethernet/marvell | |
| parent | netpoll: Drop budget parameter from NAPI polling call hierarchy (diff) | |
| download | linux-dev-0f50c10d2683fd2b8a3908c779c5f29bcb3c2174.tar.xz linux-dev-0f50c10d2683fd2b8a3908c779c5f29bcb3c2174.zip | |
RESEND: [PATCH v3 net-next] sky2: use random address if EEPROM is bad
On some embedded systems the EEPROM does not contain a valid MAC address.
In that case it is better to fallback to a generated mac address and
let init scripts fix the value later.
Reported-by: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
[Changed handcoded setup to use eth_hw_addr_random() and to save new address into HW]
Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell')
| -rw-r--r-- | drivers/net/ethernet/marvell/sky2.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index d9f4498832a1..5606a043063e 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -4819,6 +4819,18 @@ static struct net_device *sky2_init_netdev(struct sky2_hw *hw, unsigned port, memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port * 8, ETH_ALEN); + /* if the address is invalid, use a random value */ + if (!is_valid_ether_addr(dev->dev_addr)) { + struct sockaddr sa = { AF_UNSPEC }; + + netdev_warn(dev, + "Invalid MAC address, defaulting to random\n"); + eth_hw_addr_random(dev); + memcpy(sa.sa_data, dev->dev_addr, ETH_ALEN); + if (sky2_set_mac_address(dev, &sa)) + netdev_warn(dev, "Failed to set MAC address.\n"); + } + return dev; } |