summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/8390
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2021-11-19 10:10:27 +0300
committerDavid S. Miller <davem@davemloft.net>2021-11-19 14:05:21 +0300
commit973a34c087f43b61b26570110a284faf48d08d5d (patch)
tree995451c3b9d919d6cfec841ff7e992d31d560b5c /drivers/net/ethernet/8390
parentd7d28e90e229a8af0472421015c5828f5cd1ad2e (diff)
downloadlinux-973a34c087f43b61b26570110a284faf48d08d5d.tar.xz
8390: mac8390: use eth_hw_addr_set()
Use temp to pass to the reading function, the function is generic so can't fix there. Fixes m68k build. Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/8390')
-rw-r--r--drivers/net/ethernet/8390/mac8390.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/8390/mac8390.c b/drivers/net/ethernet/8390/mac8390.c
index 91b04abfd687..7fb819b9b89a 100644
--- a/drivers/net/ethernet/8390/mac8390.c
+++ b/drivers/net/ethernet/8390/mac8390.c
@@ -292,6 +292,7 @@ static bool mac8390_rsrc_init(struct net_device *dev,
struct nubus_dirent ent;
int offset;
volatile unsigned short *i;
+ u8 addr[ETH_ALEN];
dev->irq = SLOT2IRQ(board->slot);
/* This is getting to be a habit */
@@ -314,7 +315,8 @@ static bool mac8390_rsrc_init(struct net_device *dev,
return false;
}
- nubus_get_rsrc_mem(dev->dev_addr, &ent, 6);
+ nubus_get_rsrc_mem(addr, &ent, 6);
+ eth_hw_addr_set(dev, addr);
if (useresources[cardtype] == 1) {
nubus_rewinddir(&dir);