lkml.org 
[lkml]   [2022]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.16 042/217] 8390: mac8390: use eth_hw_addr_set()
    Date
    From: Jakub Kicinski <kuba@kernel.org>

    [ Upstream commit 973a34c087f43b61b26570110a284faf48d08d5d ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/8390/mac8390.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/8390/mac8390.c b/drivers/net/ethernet/8390/mac8390.c
    index 91b04abfd6875..7fb819b9b89a5 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);
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-01-18 03:22    [W:2.833 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site