From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>,
nicolas.ferre@microchip.com, claudiu.beznea@microchip.com,
f.fainelli@gmail.com, petkan@nucleusys.com,
christophe.jaillet@wanadoo.fr, zhangchangzhong@huawei.com,
linux-usb@vger.kernel.org
Subject: [PATCH net-next 4/7] ethernet: manually convert memcpy(dev_addr,..., sizeof(addr))
Date: Wed, 13 Oct 2021 13:44:32 -0700 [thread overview]
Message-ID: <20211013204435.322561-5-kuba@kernel.org> (raw)
In-Reply-To: <20211013204435.322561-1-kuba@kernel.org>
A handful of drivers use sizeof(addr) for the size of
the address, after manually confirming the size is
indeed 6 convert them to eth_hw_addr_set().
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
CC: nicolas.ferre@microchip.com
CC: claudiu.beznea@microchip.com
CC: f.fainelli@gmail.com
CC: petkan@nucleusys.com
CC: christophe.jaillet@wanadoo.fr
CC: zhangchangzhong@huawei.com
CC: linux-usb@vger.kernel.org
---
drivers/net/ethernet/cadence/macb_main.c | 2 +-
drivers/net/ethernet/dnet.c | 2 +-
drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +-
drivers/net/ethernet/ti/cpmac.c | 2 +-
drivers/net/usb/pegasus.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 683f14665c2c..029dea2873e3 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -313,7 +313,7 @@ static void macb_get_hwaddr(struct macb *bp)
addr[5] = (top >> 8) & 0xff;
if (is_valid_ether_addr(addr)) {
- memcpy(bp->dev->dev_addr, addr, sizeof(addr));
+ eth_hw_addr_set(bp->dev, addr);
return;
}
}
diff --git a/drivers/net/ethernet/dnet.c b/drivers/net/ethernet/dnet.c
index 3ed21ba4eb99..92462ed87bc4 100644
--- a/drivers/net/ethernet/dnet.c
+++ b/drivers/net/ethernet/dnet.c
@@ -93,7 +93,7 @@ static void dnet_get_hwaddr(struct dnet *bp)
*((__be16 *)(addr + 4)) = cpu_to_be16(tmp);
if (is_valid_ether_addr(addr))
- memcpy(bp->dev->dev_addr, addr, sizeof(addr));
+ eth_hw_addr_set(bp->dev, addr);
}
static int dnet_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c
index 5512e43bafc1..f0ace3a0e85c 100644
--- a/drivers/net/ethernet/pasemi/pasemi_mac.c
+++ b/drivers/net/ethernet/pasemi/pasemi_mac.c
@@ -1722,7 +1722,7 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err = -ENODEV;
goto out;
}
- memcpy(dev->dev_addr, mac->mac_addr, sizeof(mac->mac_addr));
+ eth_hw_addr_set(dev, mac->mac_addr);
ret = mac_to_intf(mac);
if (ret < 0) {
diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c
index 02d4e51f7306..7449436fc87c 100644
--- a/drivers/net/ethernet/ti/cpmac.c
+++ b/drivers/net/ethernet/ti/cpmac.c
@@ -1112,7 +1112,7 @@ static int cpmac_probe(struct platform_device *pdev)
priv->dev = dev;
priv->ring_size = 64;
priv->msg_enable = netif_msg_init(debug_level, 0xff);
- memcpy(dev->dev_addr, pdata->dev_addr, sizeof(pdata->dev_addr));
+ eth_hw_addr_set(dev, pdata->dev_addr);
snprintf(priv->phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT,
mdio_bus_id, phy_id);
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 6a92a3fef75e..c4cd40b090fd 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -357,7 +357,7 @@ static void set_ethernet_addr(pegasus_t *pegasus)
goto err;
}
- memcpy(pegasus->net->dev_addr, node_id, sizeof(node_id));
+ eth_hw_addr_set(pegasus->net, node_id);
return;
err:
--
2.31.1
next prev parent reply other threads:[~2021-10-13 20:44 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-13 20:44 [PATCH net-next 0/7] ethernet: more netdev->dev_addr write removals Jakub Kicinski
2021-10-13 20:44 ` [PATCH net-next 1/7] ethernet: constify references to netdev->dev_addr in drivers Jakub Kicinski
2021-10-14 5:36 ` kernel test robot
2021-10-14 6:15 ` kernel test robot
2021-10-13 20:44 ` [PATCH net-next 2/7] ethernet: make eth_hw_addr_random() use dev_addr_set() Jakub Kicinski
2021-10-13 20:44 ` [PATCH net-next 3/7] ethernet: make use of eth_hw_addr_random() where appropriate Jakub Kicinski
2021-10-13 23:50 ` Linus Walleij
2021-10-13 20:44 ` Jakub Kicinski [this message]
2021-10-14 2:27 ` [PATCH net-next 4/7] ethernet: manually convert memcpy(dev_addr,..., sizeof(addr)) Florian Fainelli
2021-10-14 7:43 ` Petko Manolov
2021-10-14 8:14 ` Nicolas Ferre
2021-10-13 20:44 ` [PATCH net-next 5/7] ethernet: ibm/emac: use of_get_ethdev_address() to load dev_addr Jakub Kicinski
2021-10-13 20:44 ` [PATCH net-next 6/7] ethernet: replace netdev->dev_addr assignment loops Jakub Kicinski
2021-10-13 20:44 ` [PATCH net-next 7/7] ethernet: replace netdev->dev_addr 16bit writes Jakub Kicinski
2021-10-14 2:28 ` Florian Fainelli
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=20211013204435.322561-5-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=christophe.jaillet@wanadoo.fr \
--cc=claudiu.beznea@microchip.com \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=petkan@nucleusys.com \
--cc=zhangchangzhong@huawei.com \
/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).