From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4605C433FE for ; Tue, 18 Jan 2022 02:22:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244999AbiARCWZ (ORCPT ); Mon, 17 Jan 2022 21:22:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239556AbiARCWH (ORCPT ); Mon, 17 Jan 2022 21:22:07 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F3ACC061574; Mon, 17 Jan 2022 18:22:06 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D087D612D3; Tue, 18 Jan 2022 02:22:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8AF24C36AE3; Tue, 18 Jan 2022 02:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642472525; bh=lCt6s1XiY9IrHfXCjB2XzdbfCwBwul/BJaocMzVH0cI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QhRTFGEuOPlBeuI2DkyookOMQegSjBo5kKWhnpuJuXw69FwzDqrA+K0lZbTGWbgqs 9AIB+tqi5uYcg8W5s0ThVngLChO4P4aEP1LR2mVjj5locy4LYWs28olx6NC2HvCLHy Ujr/pU6rSK6NctDx0JrKbv45m39L+lbhj8ZXiw3vT+akyOfsLsKd3N8eLoe1K/k516 7fVb1rcENxBNakOKu8V0JJKCqSte8RvN0JdVhTWc2BSBINOGpBnsgDsgoyx8vT3pIr JKkkmArozxVVEputc0rcfHyQKEP/iolunW7zaGvSW0In+ohy6GRsOc0hPcTTNQDvQH 4nwZyCpgpXNZQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jakub Kicinski , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.16 041/217] 8390: hydra: use eth_hw_addr_set() Date: Mon, 17 Jan 2022 21:16:44 -0500 Message-Id: <20220118021940.1942199-41-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118021940.1942199-1-sashal@kernel.org> References: <20220118021940.1942199-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jakub Kicinski [ Upstream commit d7d28e90e229a8af0472421015c5828f5cd1ad2e ] Loop with offsetting to every second byte, so use a temp buffer. Fixes m68k build. Signed-off-by: Jakub Kicinski Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/8390/hydra.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/8390/hydra.c b/drivers/net/ethernet/8390/hydra.c index 941754ea78ecf..1df7601af86a4 100644 --- a/drivers/net/ethernet/8390/hydra.c +++ b/drivers/net/ethernet/8390/hydra.c @@ -116,6 +116,7 @@ static int hydra_init(struct zorro_dev *z) unsigned long ioaddr = board+HYDRA_NIC_BASE; const char name[] = "NE2000"; int start_page, stop_page; + u8 macaddr[ETH_ALEN]; int j; int err; @@ -129,7 +130,8 @@ static int hydra_init(struct zorro_dev *z) return -ENOMEM; for (j = 0; j < ETH_ALEN; j++) - dev->dev_addr[j] = *((u8 *)(board + HYDRA_ADDRPROM + 2*j)); + macaddr[j] = *((u8 *)(board + HYDRA_ADDRPROM + 2*j)); + eth_hw_addr_set(dev, macaddr); /* We must set the 8390 for word mode. */ z_writeb(0x4b, ioaddr + NE_EN0_DCFG); -- 2.34.1