Commit c3dc2f71 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller

amd: atarilance: use eth_hw_addr_set()

Byte by byte assignments.

Fixes build on m68k.
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 21942eef
...@@ -471,6 +471,7 @@ static unsigned long __init lance_probe1( struct net_device *dev, ...@@ -471,6 +471,7 @@ static unsigned long __init lance_probe1( struct net_device *dev,
int i; int i;
static int did_version; static int did_version;
unsigned short save1, save2; unsigned short save1, save2;
u8 addr[ETH_ALEN];
PROBE_PRINT(( "Probing for Lance card at mem %#lx io %#lx\n", PROBE_PRINT(( "Probing for Lance card at mem %#lx io %#lx\n",
(long)memaddr, (long)ioaddr )); (long)memaddr, (long)ioaddr ));
...@@ -585,14 +586,16 @@ static unsigned long __init lance_probe1( struct net_device *dev, ...@@ -585,14 +586,16 @@ static unsigned long __init lance_probe1( struct net_device *dev,
eth_hw_addr_set(dev, OldRieblDefHwaddr); eth_hw_addr_set(dev, OldRieblDefHwaddr);
break; break;
case NEW_RIEBL: 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; break;
case PAM_CARD: case PAM_CARD:
i = IO->eeprom; i = IO->eeprom;
for( i = 0; i < 6; ++i ) for( i = 0; i < 6; ++i )
dev->dev_addr[i] = addr[i] =
((((unsigned short *)MEM)[i*2] & 0x0f) << 4) | ((((unsigned short *)MEM)[i*2] & 0x0f) << 4) |
((((unsigned short *)MEM)[i*2+1] & 0x0f)); ((((unsigned short *)MEM)[i*2+1] & 0x0f));
eth_hw_addr_set(dev, addr);
i = IO->mem; i = IO->mem;
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment