From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>,
jes@trained-monkey.org, linux-hippi@sunsite.dk
Subject: [PATCH net-next v2 08/12] net: hippi: use dev_addr_set()
Date: Thu, 21 Oct 2021 06:12:10 -0700 [thread overview]
Message-ID: <20211021131214.2032925-9-kuba@kernel.org> (raw)
In-Reply-To: <20211021131214.2032925-1-kuba@kernel.org>
Commit 406f42fa0d3c ("net-next: When a bond have a massive amount
of VLANs...") introduced a rbtree for faster Ethernet address look
up. To maintain netdev->dev_addr in this tree we need to make all
the writes to it got through appropriate helpers.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
CC: jes@trained-monkey.org
CC: linux-hippi@sunsite.dk
---
drivers/net/hippi/rrunner.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index 7661dbb31162..16105292b140 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -502,6 +502,7 @@ static unsigned int write_eeprom(struct rr_private *rrpriv,
static int rr_init(struct net_device *dev)
{
+ u8 addr[HIPPI_ALEN] __aligned(4);
struct rr_private *rrpriv;
struct rr_regs __iomem *regs;
u32 sram_size, rev;
@@ -537,10 +538,11 @@ static int rr_init(struct net_device *dev)
* other method I've seen. -VAL
*/
- *(__be16 *)(dev->dev_addr) =
+ *(__be16 *)(addr) =
htons(rr_read_eeprom_word(rrpriv, offsetof(struct eeprom, manf.BoardULA)));
- *(__be32 *)(dev->dev_addr+2) =
+ *(__be32 *)(addr+2) =
htonl(rr_read_eeprom_word(rrpriv, offsetof(struct eeprom, manf.BoardULA[4])));
+ dev_addr_set(dev, addr);
printk(" MAC: %pM\n", dev->dev_addr);
--
2.31.1
next prev parent reply other threads:[~2021-10-21 13:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-21 13:12 [PATCH net-next v2 00/12] net: don't write directly to netdev->dev_addr Jakub Kicinski
2021-10-21 13:12 ` [PATCH net-next v2 01/12] net: xen: use eth_hw_addr_set() Jakub Kicinski
2021-10-23 0:41 ` Boris Ostrovsky
2021-10-25 10:55 ` Wei Liu
2021-10-21 13:12 ` [PATCH net-next v2 02/12] usb: smsc: " Jakub Kicinski
2021-10-21 13:12 ` [PATCH net-next v2 03/12] net: qmi_wwan: use dev_addr_mod() Jakub Kicinski
2021-10-21 13:12 ` [PATCH net-next v2 04/12] net: usb: don't write directly to netdev->dev_addr Jakub Kicinski
2021-10-21 13:12 ` [PATCH net-next v2 05/12] fddi: defxx,defza: use dev_addr_set() Jakub Kicinski
2021-10-21 13:12 ` [PATCH net-next v2 06/12] fddi: skfp: constify and " Jakub Kicinski
2021-10-21 13:12 ` [PATCH net-next v2 07/12] net: fjes: constify and use eth_hw_addr_set() Jakub Kicinski
2021-10-21 13:12 ` Jakub Kicinski [this message]
2021-10-21 13:12 ` [PATCH net-next v2 09/12] net: s390: " Jakub Kicinski
2021-10-21 13:12 ` [PATCH net-next v2 10/12] net: plip: " Jakub Kicinski
2021-10-21 13:12 ` [PATCH net-next v2 11/12] net: sb1000,rionet: " Jakub Kicinski
2021-10-21 13:12 ` [PATCH net-next v2 12/12] net: hldc_fr: use dev_addr_set() Jakub Kicinski
2021-10-22 6:22 ` Krzysztof Hałasa
2021-10-22 17:20 ` [PATCH net-next v2 00/12] net: don't write directly to netdev->dev_addr patchwork-bot+netdevbpf
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=20211021131214.2032925-9-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=davem@davemloft.net \
--cc=jes@trained-monkey.org \
--cc=linux-hippi@sunsite.dk \
--cc=netdev@vger.kernel.org \
/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).