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.15 032/188] amd: atarilance: use eth_hw_addr_set()
    Date
    From: Jakub Kicinski <kuba@kernel.org>

    [ Upstream commit c3dc2f7196ca0f59d9baeb5d3b927e703944dc6c ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/amd/atarilance.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/amd/atarilance.c b/drivers/net/ethernet/amd/atarilance.c
    index 9d2f49fd945ed..f57c82f8ae647 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,
    memcpy(dev->dev_addr, OldRieblDefHwaddr, ETH_ALEN);
    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;
    }
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-01-18 03:39    [W:4.661 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site