Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3384109pxb; Mon, 17 Jan 2022 19:13:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJxaT18frb6J7vITOXxRCNKWaB73tcSxADLAMB55PMd3dJDOU1WGsgptCVOkUvo76Z36HR3F X-Received: by 2002:a17:902:8ec5:b0:149:d41a:baa8 with SMTP id x5-20020a1709028ec500b00149d41abaa8mr24885738plo.115.1642475615578; Mon, 17 Jan 2022 19:13:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642475615; cv=none; d=google.com; s=arc-20160816; b=Ik2zR6t9HxJnq+lQBGmtPMYz7DvMRlyxfSi7MDLfHNe1VKIdPdrp6mSRmugLr81PjP yz0WlGCssi8Zo4TTs9diOw2Fyo/6xq7jatGFi6+FpnLmxHD2PPyQr4yhW6wMgazdWCwi 9q4e6TEkume3wobTsAOwuQ6nYfgBLFvgEDy5SaiIAb8aQynJtyxXSP1gDFfCzxs6jNWM wkfDH5C1O4Ai4DkwyTzmNyxmnFoB/fXlbixt8GJh92I3OSwRIIjlCt2qPWz5WVTqmER0 h4aSQ2I9s/nLOAWXaiJBT63N8OKam7wUOjEExXcfzmeJ1M1Rcnolo7/4jLjAGHBMmzeZ PAtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lJLpoLGv2pbOuMr7Ahjky492Jm8d62Bau7yteMO4N3A=; b=yd+8S2pqkZuyJcLBn4lCqfmVYg5o+Q3hBuRtH11CmUH8CRan8gLL7RKmeeLDYcrqIW 8NlvFhkEWReMVxF1bLMSczkkkmVzaGRsM0twdzW1h/jph7oJGAIJZMEzEJ195nwuA0cr 1Tm+tQU7vv1LK3HaAJdx+ojo/4hWH2c48QtTe+68RQzK5fUadTgdVS1uZrtona1+uXA0 5SbeUNMZ0T633fiIodrHKthgRSPd1H9apu95oQIUDzBYRBRXtYrHuzIgkIbWOlqm62vt QbV0S+sE40ZGTupX76n3I5ko6IttiFuLP4ETn+XSY8y44QXjCM+mnM+Oamb0wdfkt/Hm P4ZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tIvtQtLb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x8si1196581pjf.149.2022.01.17.19.13.24; Mon, 17 Jan 2022 19:13:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tIvtQtLb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244889AbiARCWT (ORCPT + 99 others); Mon, 17 Jan 2022 21:22:19 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:36074 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244888AbiARCV6 (ORCPT ); Mon, 17 Jan 2022 21:21:58 -0500 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 79B17B81233; Tue, 18 Jan 2022 02:21:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3FA8CC36AE3; Tue, 18 Jan 2022 02:21:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642472515; bh=UpsprJJW4lY/e6ZoX9JBjVJaE+uumK8qxGzR9yydx6A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tIvtQtLbDvENQMOS4zEgDXr9cMB+3eHOp+J9IG22PNqMAx39wzo1MkoEocEjRTQY5 LOSkgIbzioJyE9ftwE7LzEPlf+Y/Pj3sgBSMWB3jg8YECARfDBPbwlyK/wRJEBYh1s 4ndmmxeo8tzV59Q/BR/t5ScyzFaSJmOYMGe5gjQ3kJYlRefkDIqewbU0edKRxjJQqo d4CqOOONqQTZWVf/kcAhJc6stcpzvuguM121kAYPeLXts3szWyGtmU4YUMGiWq3dY3 ECx0eO98ns2Btsazf/b966KBlccF0y3uvBDn2htVnOgoEZEYz8hiwB1i24E9KLlN4A 4n12m6wmrF6dg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jakub Kicinski , "David S . Miller" , Sasha Levin , geert@linux-m68k.org, ojeda@kernel.org, tanghui20@huawei.com, arnd@arndb.de, masahiroy@kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.16 038/217] amd: atarilance: use eth_hw_addr_set() Date: Mon, 17 Jan 2022 21:16:41 -0500 Message-Id: <20220118021940.1942199-38-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: linux-kernel@vger.kernel.org From: Jakub Kicinski [ Upstream commit c3dc2f7196ca0f59d9baeb5d3b927e703944dc6c ] 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/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 9c7d9690d00c4..27869164c6e62 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, eth_hw_addr_set(dev, OldRieblDefHwaddr); 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