diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2021-11-18 23:10:23 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-11-19 11:05:20 +0000 |
| commit | c3dc2f7196ca0f59d9baeb5d3b927e703944dc6c (patch) | |
| tree | af6f403052a0c0a965038d4a12aeb358f863373e /drivers/net/ethernet/amd | |
| parent | amd: hplance: use eth_hw_addr_set() (diff) | |
| download | linux-dev-c3dc2f7196ca0f59d9baeb5d3b927e703944dc6c.tar.xz linux-dev-c3dc2f7196ca0f59d9baeb5d3b927e703944dc6c.zip | |
amd: atarilance: use eth_hw_addr_set()
Byte by byte assignments.
Fixes build on m68k.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/amd')
| -rw-r--r-- | drivers/net/ethernet/amd/atarilance.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/ethernet/amd/atarilance.c b/drivers/net/ethernet/amd/atarilance.c index 9c7d9690d00c..27869164c6e6 100644 --- a/drivers/net/ethernet/amd/atarilance.c +++ b/drivers/net/ethernet/amd/atarilance.c @@ -471,6 +471,7 @@ static unsigned long __init lance_probe1( struct net_device *dev, int i; static int did_version; unsigned short save1, save2; + u8 addr[ETH_ALEN]; PROBE_PRINT(( "Probing for Lance card at mem %#lx io %#lx\n", (long)memaddr, (long)ioaddr )); @@ -585,14 +586,16 @@ static unsigned long __init lance_probe1( struct net_device *dev, eth_hw_addr_set(dev, OldRieblDefHwaddr); break; case NEW_RIEBL: - lp->memcpy_f(dev->dev_addr, RIEBL_HWADDR_ADDR, ETH_ALEN); + lp->memcpy_f(addr, RIEBL_HWADDR_ADDR, ETH_ALEN); + eth_hw_addr_set(dev, addr); break; case PAM_CARD: i = IO->eeprom; for( i = 0; i < 6; ++i ) - dev->dev_addr[i] = + addr[i] = ((((unsigned short *)MEM)[i*2] & 0x0f) << 4) | ((((unsigned short *)MEM)[i*2+1] & 0x0f)); + eth_hw_addr_set(dev, addr); i = IO->mem; break; } |