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>

diff --git a/drivers/net/ethernet/natsemi/jazzsonic.c b/drivers/net/ethernet/natsemi/jazzsonic.c
index d74a80f010c51165b2fad0738eb79851f292ac45..3f371faeb6d0d8692ca7d88f14126377bc145b7a 100644 (file)
--- a/drivers/net/ethernet/natsemi/jazzsonic.c
+++ b/drivers/net/ethernet/natsemi/jazzsonic.c
@@ -114,6 +114,7 @@ static int sonic_probe1(struct net_device *dev)
        struct sonic_local *lp = netdev_priv(dev);
        int err = -ENODEV;
        int i;
+       unsigned char addr[ETH_ALEN];
 
        if (!request_mem_region(dev->base_addr, SONIC_MEM_SIZE, jazz_sonic_string))
                return -EBUSY;
@@ -143,9 +144,10 @@ static int sonic_probe1(struct net_device *dev)
        SONIC_WRITE(SONIC_CEP,0);
        for (i=0; i<3; i++) {
                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;
 

diff --git a/drivers/net/ethernet/natsemi/xtsonic.c b/drivers/net/ethernet/natsemi/xtsonic.c
index ca4686094701c60eff5a9991990575257f1310ca..7d51bcb1b91802e285e59fc15c6e27b54d7b3856 100644 (file)
--- 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;