From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next 07/12] net: fjes: constify and use eth_hw_addr_set()
Date: Wed, 20 Oct 2021 08:56:12 -0700 [thread overview]
Message-ID: <20211020155617.1721694-8-kuba@kernel.org> (raw)
In-Reply-To: <20211020155617.1721694-1-kuba@kernel.org>
Get it ready for constant netdev->dev_addr.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
drivers/net/fjes/fjes_hw.c | 3 ++-
drivers/net/fjes/fjes_hw.h | 2 +-
drivers/net/fjes/fjes_main.c | 14 ++++++++------
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/drivers/net/fjes/fjes_hw.c b/drivers/net/fjes/fjes_hw.c
index 065bb0a40b1d..704e949484d0 100644
--- a/drivers/net/fjes/fjes_hw.c
+++ b/drivers/net/fjes/fjes_hw.c
@@ -137,7 +137,8 @@ static void fjes_hw_free_epbuf(struct epbuf_handler *epbh)
epbh->ring = NULL;
}
-void fjes_hw_setup_epbuf(struct epbuf_handler *epbh, u8 *mac_addr, u32 mtu)
+void fjes_hw_setup_epbuf(struct epbuf_handler *epbh, const u8 *mac_addr,
+ u32 mtu)
{
union ep_buffer_info *info = epbh->info;
u16 vlan_id[EP_BUFFER_SUPPORT_VLAN_MAX];
diff --git a/drivers/net/fjes/fjes_hw.h b/drivers/net/fjes/fjes_hw.h
index b4608ea2a2d5..997c7b37a402 100644
--- a/drivers/net/fjes/fjes_hw.h
+++ b/drivers/net/fjes/fjes_hw.h
@@ -330,7 +330,7 @@ int fjes_hw_register_buff_addr(struct fjes_hw *, int,
int fjes_hw_unregister_buff_addr(struct fjes_hw *, int);
void fjes_hw_init_command_registers(struct fjes_hw *,
struct fjes_device_command_param *);
-void fjes_hw_setup_epbuf(struct epbuf_handler *, u8 *, u32);
+void fjes_hw_setup_epbuf(struct epbuf_handler *, const u8 *, u32);
int fjes_hw_raise_interrupt(struct fjes_hw *, int, enum REG_ICTL_MASK);
void fjes_hw_set_irqmask(struct fjes_hw *, enum REG_ICTL_MASK, bool);
u32 fjes_hw_capture_interrupt_status(struct fjes_hw *);
diff --git a/drivers/net/fjes/fjes_main.c b/drivers/net/fjes/fjes_main.c
index 185c8a398681..b06c17ac8d4e 100644
--- a/drivers/net/fjes/fjes_main.c
+++ b/drivers/net/fjes/fjes_main.c
@@ -1203,6 +1203,7 @@ static int fjes_probe(struct platform_device *plat_dev)
struct net_device *netdev;
struct resource *res;
struct fjes_hw *hw;
+ u8 addr[ETH_ALEN];
int err;
err = -ENOMEM;
@@ -1266,12 +1267,13 @@ static int fjes_probe(struct platform_device *plat_dev)
goto err_free_control_wq;
/* setup MAC address (02:00:00:00:00:[epid])*/
- netdev->dev_addr[0] = 2;
- netdev->dev_addr[1] = 0;
- netdev->dev_addr[2] = 0;
- netdev->dev_addr[3] = 0;
- netdev->dev_addr[4] = 0;
- netdev->dev_addr[5] = hw->my_epid; /* EPID */
+ addr[0] = 2;
+ addr[1] = 0;
+ addr[2] = 0;
+ addr[3] = 0;
+ addr[4] = 0;
+ addr[5] = hw->my_epid; /* EPID */
+ eth_hw_addr_set(netdev, addr);
err = register_netdev(netdev);
if (err)
--
2.31.1
next prev parent reply other threads:[~2021-10-20 15:56 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-20 15:56 [PATCH net-next 00/12] net: don't write directly to netdev->dev_addr Jakub Kicinski
2021-10-20 15:56 ` [PATCH net-next 01/12] net: xen: use eth_hw_addr_set() Jakub Kicinski
2021-10-20 15:56 ` [PATCH net-next 02/12] usb: smsc: " Jakub Kicinski
2021-10-20 15:56 ` [PATCH net-next 03/12] net: qmi_wwan: use dev_addr_mod() Jakub Kicinski
2021-10-20 16:11 ` Bjørn Mork
2021-10-20 15:56 ` [PATCH net-next 04/12] net: usb: don't write directly to netdev->dev_addr Jakub Kicinski
2021-10-21 9:55 ` Oliver Neukum
2021-10-21 13:06 ` Jakub Kicinski
2021-10-20 15:56 ` [PATCH net-next 05/12] fddi: defxx,defza: use dev_addr_set() Jakub Kicinski
2021-10-20 18:16 ` Maciej W. Rozycki
2021-10-20 15:56 ` [PATCH net-next 06/12] fddi: skfp: constify and " Jakub Kicinski
2021-10-20 15:56 ` Jakub Kicinski [this message]
2021-10-20 15:56 ` [PATCH net-next 08/12] net: hippi: " Jakub Kicinski
2021-10-20 15:56 ` [PATCH net-next 09/12] net: s390: constify and use eth_hw_addr_set() Jakub Kicinski
2021-10-20 22:30 ` Julian Wiedmann
2021-10-21 13:05 ` Jakub Kicinski
2021-10-20 15:56 ` [PATCH net-next 10/12] net: plip: " Jakub Kicinski
2021-10-20 15:56 ` [PATCH net-next 11/12] net: sb1000,rionet: " Jakub Kicinski
2021-10-20 15:56 ` [PATCH net-next 12/12] net: hldc_fr: use dev_addr_set() Jakub Kicinski
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=20211020155617.1721694-8-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.