diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-11-18 23:10:30 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-11-19 11:05:21 +0000 |
| commit | 5b6d5affd27486ec9152a66df1741cf67782712a (patch) | |
| tree | d3cfa0269cc14702e749f5bb41e7a5b1c482b719 | |
| parent | 80db345e7df0c507a83bd12ac7766fb054443804 (diff) | |
| download | linux-5b6d5affd27486ec9152a66df1741cf67782712a.tar.gz linux-5b6d5affd27486ec9152a66df1741cf67782712a.tar.bz2 linux-5b6d5affd27486ec9152a66df1741cf67782712a.zip | |
lasi_82594: use eth_hw_addr_set()
dev_addr is set from IO reads, passed to an arch-specific helper.
Note that the helper never reads it so uninitialized temp is fine.
Fixes build on parisc.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/i825xx/lasi_82596.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/i825xx/lasi_82596.c b/drivers/net/ethernet/i825xx/lasi_82596.c index 48e001881c75..0af70094aba3 100644 --- a/drivers/net/ethernet/i825xx/lasi_82596.c +++ b/drivers/net/ethernet/i825xx/lasi_82596.c @@ -147,6 +147,7 @@ lan_init_chip(struct parisc_device *dev) struct net_device *netdevice; struct i596_private *lp; int retval = -ENOMEM; + u8 addr[ETH_ALEN]; int i; if (!dev->irq) { @@ -167,13 +168,14 @@ lan_init_chip(struct parisc_device *dev) netdevice->base_addr = dev->hpa.start; netdevice->irq = dev->irq; - if (pdc_lan_station_id(netdevice->dev_addr, netdevice->base_addr)) { + if (pdc_lan_station_id(addr, netdevice->base_addr)) { for (i = 0; i < 6; i++) { - netdevice->dev_addr[i] = gsc_readb(LAN_PROM_ADDR + i); + addr[i] = gsc_readb(LAN_PROM_ADDR + i); } printk(KERN_INFO "%s: MAC of HP700 LAN read from EEPROM\n", __FILE__); } + eth_hw_addr_set(netdevice, addr); lp = netdev_priv(netdevice); lp->options = dev->id.sversion == 0x72 ? OPT_SWAP_PORT : 0; |