From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next v2 11/12] net: sb1000,rionet: use eth_hw_addr_set()
Date: Thu, 21 Oct 2021 06:12:13 -0700 [thread overview]
Message-ID: <20211021131214.2032925-12-kuba@kernel.org> (raw)
In-Reply-To: <20211021131214.2032925-1-kuba@kernel.org>
Get these two oldies ready for constant netdev->dev_addr.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
drivers/net/rionet.c | 14 ++++++++------
drivers/net/sb1000.c | 12 ++++++++----
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index 2056d6ad04b5..1a95f3beb784 100644
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -482,6 +482,7 @@ static int rionet_setup_netdev(struct rio_mport *mport, struct net_device *ndev)
{
int rc = 0;
struct rionet_private *rnet;
+ u8 addr[ETH_ALEN];
u16 device_id;
const size_t rionet_active_bytes = sizeof(void *) *
RIO_MAX_ROUTE_ENTRIES(mport->sys_size);
@@ -501,12 +502,13 @@ static int rionet_setup_netdev(struct rio_mport *mport, struct net_device *ndev)
/* Set the default MAC address */
device_id = rio_local_get_device_id(mport);
- ndev->dev_addr[0] = 0x00;
- ndev->dev_addr[1] = 0x01;
- ndev->dev_addr[2] = 0x00;
- ndev->dev_addr[3] = 0x01;
- ndev->dev_addr[4] = device_id >> 8;
- ndev->dev_addr[5] = device_id & 0xff;
+ addr[0] = 0x00;
+ addr[1] = 0x01;
+ addr[2] = 0x00;
+ addr[3] = 0x01;
+ addr[4] = device_id >> 8;
+ addr[5] = device_id & 0xff;
+ eth_hw_addr_set(ndev, addr);
ndev->netdev_ops = &rionet_netdev_ops;
ndev->mtu = RIONET_MAX_MTU;
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c
index f01c9db01b16..57a6d598467b 100644
--- a/drivers/net/sb1000.c
+++ b/drivers/net/sb1000.c
@@ -149,6 +149,7 @@ sb1000_probe_one(struct pnp_dev *pdev, const struct pnp_device_id *id)
unsigned short ioaddr[2], irq;
unsigned int serial_number;
int error = -ENODEV;
+ u8 addr[ETH_ALEN];
if (pnp_device_attach(pdev) < 0)
return -ENODEV;
@@ -203,10 +204,13 @@ sb1000_probe_one(struct pnp_dev *pdev, const struct pnp_device_id *id)
dev->netdev_ops = &sb1000_netdev_ops;
/* hardware address is 0:0:serial_number */
- dev->dev_addr[2] = serial_number >> 24 & 0xff;
- dev->dev_addr[3] = serial_number >> 16 & 0xff;
- dev->dev_addr[4] = serial_number >> 8 & 0xff;
- dev->dev_addr[5] = serial_number >> 0 & 0xff;
+ addr[0] = 0;
+ addr[1] = 0;
+ addr[2] = serial_number >> 24 & 0xff;
+ addr[3] = serial_number >> 16 & 0xff;
+ addr[4] = serial_number >> 8 & 0xff;
+ addr[5] = serial_number >> 0 & 0xff;
+ eth_hw_addr_set(dev, addr);
pnp_set_drvdata(pdev, dev);
--
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 ` [PATCH net-next v2 08/12] net: hippi: use dev_addr_set() Jakub Kicinski
2021-10-21 13:12 ` [PATCH net-next v2 09/12] net: s390: constify and use eth_hw_addr_set() Jakub Kicinski
2021-10-21 13:12 ` [PATCH net-next v2 10/12] net: plip: " Jakub Kicinski
2021-10-21 13:12 ` Jakub Kicinski [this message]
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-12-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=davem@davemloft.net \
--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).