summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/natsemi/xtsonic.c
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2021-11-30 06:36:00 -0800
committerJakub Kicinski <kuba@kernel.org>2021-11-30 18:15:58 -0800
commit23ea630f86c70cbe6691f9f839e7b6742f0e9ad3 (patch)
tree1cc589bc218f8f92f374ca55d0567948003abd1c /drivers/net/ethernet/natsemi/xtsonic.c
parent5cfe53cfeb1c05b73e5f2e09d7fe3140b17c1204 (diff)
net: natsemi: fix hw address initialization for jazz and xtensa
Use eth_hw_addr_set function instead of writing the address directly to net_device::dev_addr. Fixes: adeef3e32146 ("net: constify netdev->dev_addr") Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested Link: https://lore.kernel.org/r/20211130143600.31970-1-jcmvbkbc@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/natsemi/xtsonic.c')
-rw-r--r--drivers/net/ethernet/natsemi/xtsonic.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/natsemi/xtsonic.c b/drivers/net/ethernet/natsemi/xtsonic.c
index ca4686094701..7d51bcb1b918 100644
--- a/drivers/net/ethernet/natsemi/xtsonic.c
+++ b/drivers/net/ethernet/natsemi/xtsonic.c
@@ -127,6 +127,7 @@ static int __init sonic_probe1(struct net_device *dev)
unsigned int base_addr = dev->base_addr;
int i;
int err = 0;
+ unsigned char addr[ETH_ALEN];
if (!request_mem_region(base_addr, 0x100, xtsonic_string))
return -EBUSY;
@@ -163,9 +164,10 @@ static int __init sonic_probe1(struct net_device *dev)
for (i=0; i<3; i++) {
unsigned int val = SONIC_READ(SONIC_CAP0-i);
- dev->dev_addr[i*2] = val;
- dev->dev_addr[i*2+1] = val >> 8;
+ addr[i*2] = val;
+ addr[i*2+1] = val >> 8;
}
+ eth_hw_addr_set(dev, addr);
lp->dma_bitmode = SONIC_BITMODE32;