diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2021-10-19 08:00:10 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-10-20 11:41:01 +0100 |
| commit | 83f262babddeca1a7c71477402b778ea0171fa9e (patch) | |
| tree | 71dc08a5e647d52bb5a27b02fec761d9bac4fd0e | |
| parent | ethernet: tlan: use eth_hw_addr_set() (diff) | |
| download | linux-dev-83f262babddeca1a7c71477402b778ea0171fa9e.tar.xz linux-dev-83f262babddeca1a7c71477402b778ea0171fa9e.zip | |
ethernet: via-rhine: use eth_hw_addr_set()
Commit 406f42fa0d3c ("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>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/via/via-rhine.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index 3b73a9c55a5a..509c5e9b29df 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c @@ -899,6 +899,7 @@ static int rhine_init_one_common(struct device *hwdev, u32 quirks, struct net_device *dev; struct rhine_private *rp; int i, rc, phy_id; + u8 addr[ETH_ALEN]; const char *name; /* this should always be supported */ @@ -933,7 +934,8 @@ static int rhine_init_one_common(struct device *hwdev, u32 quirks, rhine_hw_init(dev, pioaddr); for (i = 0; i < 6; i++) - dev->dev_addr[i] = ioread8(ioaddr + StationAddr + i); + addr[i] = ioread8(ioaddr + StationAddr + i); + eth_hw_addr_set(dev, addr); if (!is_valid_ether_addr(dev->dev_addr)) { /* Report it and use a random ethernet address instead */ |