openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net/faraday: Disallow using reversed MAC address from hardware 

The initial MAC address is retrieved from hardware if it's not
provided by device-tree. The reserved MAC address from hardware
will be used if non-reserved MAC address is invalid. It will
cause mismatched MAC address seen by hardware and software.

This disallows using the reserved hardware MAC address to avoid
the mismatched MAC address seen by hardware and software.

Fixes: 113ce107af ("net/faraday: Read MAC address from chip")
Suggested-by: David Laight <David.Laight@ACULAB.COM>
Suggested-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Gavin Shan 2016-07-21 11:42:54 +10:00 committed by David S. Miller
parent c0d661ca37
commit e6c044f5f6
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ethernet/faraday/ftgmac100.c
View File

@ -163,15 +163,6 @@ static void ftgmac100_setup_mac(struct ftgmac100 *priv)
mac[4] = (l >> 8) & 0xff;
mac[5] = l & 0xff;
if (!is_valid_ether_addr(mac)) {
mac[5] = (m >> 8) & 0xff;
mac[4] = m & 0xff;
mac[3] = (l >> 24) & 0xff;
mac[2] = (l >> 16) & 0xff;
mac[1] = (l >> 8) & 0xff;
mac[0] = l & 0xff;
}
if (is_valid_ether_addr(mac)) {
ether_addr_copy(priv->netdev->dev_addr, mac);
dev_info(priv->dev, "Read MAC address %pM from chip\n", mac);