From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Jakub Kicinski <kuba@kernel.org>,
"David S . Miller" <davem@davemloft.net>,
Sasha Levin <sashal@kernel.org>,
fthain@linux-m68k.org, u.kleine-koenig@pengutronix.de,
gregkh@linuxfoundation.org, netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 4.14 11/56] 8390: mac8390: use eth_hw_addr_set()
Date: Mon, 17 Jan 2022 21:48:23 -0500 [thread overview]
Message-ID: <20220118024908.1953673-11-sashal@kernel.org> (raw)
In-Reply-To: <20220118024908.1953673-1-sashal@kernel.org>
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 e95a7567bb234..4e2301798be7a 100644
--- a/drivers/net/ethernet/8390/mac8390.c
+++ b/drivers/net/ethernet/8390/mac8390.c
@@ -301,6 +301,7 @@ static bool __init mac8390_init(struct net_device *dev, struct nubus_dev *ndev,
struct nubus_dirent ent;
int offset;
volatile unsigned short *i;
+ u8 addr[ETH_ALEN];
printk_once(KERN_INFO pr_fmt("%s"), version);
@@ -326,7 +327,8 @@ static bool __init mac8390_init(struct net_device *dev, struct nubus_dev *ndev,
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
next prev parent reply other threads:[~2022-01-18 3:17 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-18 2:48 [PATCH AUTOSEL 4.14 01/56] Bluetooth: Fix debugfs entry leak in hci_register_dev() Sasha Levin
2022-01-18 2:48 ` [PATCH AUTOSEL 4.14 03/56] ar5523: Fix null-ptr-deref with unexpected WDCMSG_TARGET_START reply Sasha Levin
2022-01-18 2:48 ` [PATCH AUTOSEL 4.14 06/56] amd: a2065/ariadne: use eth_hw_addr_set() Sasha Levin
2022-01-18 2:48 ` [PATCH AUTOSEL 4.14 07/56] amd: hplance: " Sasha Levin
2022-01-18 2:48 ` [PATCH AUTOSEL 4.14 08/56] amd: atarilance: " Sasha Levin
2022-01-18 2:48 ` [PATCH AUTOSEL 4.14 09/56] amd: mvme147: " Sasha Levin
2022-01-18 2:48 ` [PATCH AUTOSEL 4.14 10/56] 8390: hydra: " Sasha Levin
2022-01-18 2:48 ` Sasha Levin [this message]
2022-01-18 2:48 ` [PATCH AUTOSEL 4.14 12/56] cirrus: mac89x0: " Sasha Levin
2022-01-18 2:48 ` [PATCH AUTOSEL 4.14 15/56] 82596: " Sasha Levin
2022-01-18 2:48 ` [PATCH AUTOSEL 4.14 17/56] mlxsw: pci: Add shutdown method in PCI driver Sasha Levin
2022-01-18 2:48 ` [PATCH AUTOSEL 4.14 21/56] mwifiex: Fix skb_over_panic in mwifiex_usb_recv() Sasha Levin
2022-01-18 2:48 ` [PATCH AUTOSEL 4.14 27/56] iwlwifi: mvm: synchronize with FW after multicast commands Sasha Levin
2022-01-18 2:48 ` [PATCH AUTOSEL 4.14 28/56] ath10k: Fix tx hanging Sasha Levin
2022-01-18 2:48 ` [PATCH AUTOSEL 4.14 29/56] net-sysfs: update the queue counts in the unregistration path Sasha Levin
2022-01-18 2:48 ` [PATCH AUTOSEL 4.14 30/56] net: Enable neighbor sysctls that is save for userns root Sasha Levin
2022-01-18 2:48 ` [PATCH AUTOSEL 4.14 31/56] net: bonding: debug: avoid printing debug logs when bond is not notifying peers Sasha Levin
2022-01-18 2:48 ` [PATCH AUTOSEL 4.14 32/56] bpf: Do not WARN in bpf_warn_invalid_xdp_action() Sasha Levin
2022-01-18 2:48 ` [PATCH AUTOSEL 4.14 38/56] ath9k: Fix out-of-bound memcpy in ath9k_hif_usb_rx_stream Sasha Levin
2022-01-18 2:48 ` [PATCH AUTOSEL 4.14 39/56] iwlwifi: fix leaks/bad data after failed firmware load Sasha Levin
2022-01-18 2:48 ` [PATCH AUTOSEL 4.14 40/56] iwlwifi: remove module loading failure message Sasha Levin
2022-01-18 2:49 ` [PATCH AUTOSEL 4.14 49/56] net: mdio: Demote probed message to debug print Sasha Levin
2022-01-18 2:49 ` [PATCH AUTOSEL 4.14 50/56] mac80211: allow non-standard VHT MCS-10/11 Sasha Levin
2022-01-18 2:49 ` [PATCH AUTOSEL 4.14 53/56] net: phy: marvell: configure RGMII delays for 88E1118 Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220118024908.1953673-11-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=davem@davemloft.net \
--cc=fthain@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).