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 79089C4332F for ; Tue, 18 Jan 2022 02:42:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346208AbiARCmS (ORCPT ); Mon, 17 Jan 2022 21:42:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344895AbiARChn (ORCPT ); Mon, 17 Jan 2022 21:37:43 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B716C0619C7; Mon, 17 Jan 2022 18:34:27 -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 ams.source.kernel.org (Postfix) with ESMTPS id ABE5CB81252; Tue, 18 Jan 2022 02:33:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B99E4C36AEB; Tue, 18 Jan 2022 02:33:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642473222; bh=wNtTxl+7OJwp4XfQcWDBPvTn86mQUGQpqISqFTZAWxc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iEbX7KKhMMG1CuRqnA9hRH7JSilqDFj7K14JkgOTaenJ4xYwT2036XKBDJY1U/pRx QHzYL/tB869dzJq3CTy9wHeHpNPWKFVmonueC1x82eevlftppI4n6JvErgs8FACK+2 Q0IiqZ0PcmYR5sqhNTctmCfHVdgoEhLhOmPhEdSw1haYvsrraWJ+lh6DekWRClFJ6I ghXEGddCwQ06bkoS+7tusElEUzVUvKneCP+jpSt5f82YxyKf8VqoRDBToAposolbmL cIb3cqbvh7/NG0Z0RLCZEBsqwt1uWdfCIojYhSO5+UobMi/HedpT/2LfYysu3WFjO1 UjI3PUQf4VjOw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jakub Kicinski , "David S . Miller" , Sasha Levin , liweihang@huawei.com, liuyixing1@huawei.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 031/188] amd: hplance: use eth_hw_addr_set() Date: Mon, 17 Jan 2022 21:29:15 -0500 Message-Id: <20220118023152.1948105-31-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118023152.1948105-1-sashal@kernel.org> References: <20220118023152.1948105-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: netdev@vger.kernel.org From: Jakub Kicinski [ Upstream commit 21942eef062781429b356974589d7965952940fb ] Byte by byte assignments. Fixes build on m68k. Signed-off-by: Jakub Kicinski Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/amd/hplance.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/amd/hplance.c b/drivers/net/ethernet/amd/hplance.c index 6784f8748638b..055fda11c5724 100644 --- a/drivers/net/ethernet/amd/hplance.c +++ b/drivers/net/ethernet/amd/hplance.c @@ -129,6 +129,7 @@ static void hplance_init(struct net_device *dev, struct dio_dev *d) { unsigned long va = (d->resource.start + DIO_VIRADDRBASE); struct hplance_private *lp; + u8 addr[ETH_ALEN]; int i; /* reset the board */ @@ -144,9 +145,10 @@ static void hplance_init(struct net_device *dev, struct dio_dev *d) /* The NVRAM holds our ethernet address, one nibble per byte, * at bytes NVRAMOFF+1,3,5,7,9... */ - dev->dev_addr[i] = ((in_8(va + HPLANCE_NVRAMOFF + i*4 + 1) & 0xF) << 4) + addr[i] = ((in_8(va + HPLANCE_NVRAMOFF + i*4 + 1) & 0xF) << 4) | (in_8(va + HPLANCE_NVRAMOFF + i*4 + 3) & 0xF); } + eth_hw_addr_set(dev, addr); lp = netdev_priv(dev); lp->lance.name = d->name; -- 2.34.1