mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
ethernet: smc91x: use eth_hw_addr_set()
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
74fad215ee
commit
02bfb6beb6
2 changed files with 6 additions and 2 deletions
|
@ -1788,6 +1788,7 @@ static int smc911x_probe(struct net_device *dev)
|
|||
struct dma_slave_config config;
|
||||
dma_cap_mask_t mask;
|
||||
#endif
|
||||
u8 addr[ETH_ALEN];
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, dev, "--> %s\n", __func__);
|
||||
|
||||
|
@ -1892,7 +1893,8 @@ static int smc911x_probe(struct net_device *dev)
|
|||
spin_lock_init(&lp->lock);
|
||||
|
||||
/* Get the MAC address */
|
||||
SMC_GET_MAC_ADDR(lp, dev->dev_addr);
|
||||
SMC_GET_MAC_ADDR(lp, addr);
|
||||
eth_hw_addr_set(dev, addr);
|
||||
|
||||
/* now, reset the chip, and put it into a known state */
|
||||
smc911x_reset(dev);
|
||||
|
|
|
@ -1851,6 +1851,7 @@ static int smc_probe(struct net_device *dev, void __iomem *ioaddr,
|
|||
int retval;
|
||||
unsigned int val, revision_register;
|
||||
const char *version_string;
|
||||
u8 addr[ETH_ALEN];
|
||||
|
||||
DBG(2, dev, "%s: %s\n", CARDNAME, __func__);
|
||||
|
||||
|
@ -1922,7 +1923,8 @@ static int smc_probe(struct net_device *dev, void __iomem *ioaddr,
|
|||
|
||||
/* Get the MAC address */
|
||||
SMC_SELECT_BANK(lp, 1);
|
||||
SMC_GET_MAC_ADDR(lp, dev->dev_addr);
|
||||
SMC_GET_MAC_ADDR(lp, addr);
|
||||
eth_hw_addr_set(dev, addr);
|
||||
|
||||
/* now, reset the chip, and put it into a known state */
|
||||
smc_reset(dev);
|
||||
|
|
Loading…
Reference in a new issue