mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-05 02:19:51 +00:00
Code Issues Releases Wiki Activity

ethernet: sky2/skge: use eth_hw_addr_set()

Browse source 
Commit 406f42fa0d ("net-next: When a bond have a massive amount
of VLANs...") introduced a rbtree for faster Ethernet address look
up. To maintain netdev->dev_addr in this tree we need to make all
the writes to it got through appropriate helpers.

Read the address into an array on the stack, then call
eth_hw_addr_set().

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2021-10-18 07:29:22 -07:00 committed by David S. Miller
parent 15c343eb05
commit 4789b57af3
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/ethernet/marvell/skge.c
View file

@ -3810,6 +3810,7 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
{
struct skge_port *skge;
struct net_device *dev = alloc_etherdev(sizeof(*skge));
u8 addr[ETH_ALEN];
if (!dev)
return NULL;
@ -3862,7 +3863,8 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
}
/* read the mac address */
memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port*8, ETH_ALEN);
memcpy_fromio(addr, hw->regs + B2_MAC_1 + port*8, ETH_ALEN);
eth_hw_addr_set(dev, addr);
return dev;
}

9
drivers/net/ethernet/marvell/sky2.c
View file

@ -4721,9 +4721,12 @@ static struct net_device *sky2_init_netdev(struct sky2_hw *hw, unsigned port,
* 2) from internal registers set by bootloader
*/
ret = of_get_ethdev_address(hw->pdev->dev.of_node, dev);
if (ret)
memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port * 8,
ETH_ALEN);
if (ret) {
u8 addr[ETH_ALEN];
memcpy_fromio(addr, hw->regs + B2_MAC_1 + port * 8, ETH_ALEN);
eth_hw_addr_set(dev, addr);
}
/* if the address is invalid, use a random value */
if (!is_valid_ether_addr(dev->dev_addr)) {