wireless: use eth_hw_addr_set()

Convert all WiFi drivers from memcpy(... ETH_ADDR)
to eth_hw_addr_set():

  @@
  expression dev, np;
  @@
  - memcpy(dev->dev_addr, np, ETH_ALEN)
  + eth_hw_addr_set(dev, np)

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20211018235021.1279697-2-kuba@kernel.org

diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index fefdc6753acd2629fbb7a5c5f2c5ac078a7b005a..51cc5f898a79bac8845d3639a99ff78f667e225c 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -3803,7 +3803,7 @@ struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name,
        vif->htcap[NL80211_BAND_2GHZ].ht_enable = true;
        vif->htcap[NL80211_BAND_5GHZ].ht_enable = true;
 
-       memcpy(ndev->dev_addr, ar->mac_addr, ETH_ALEN);
+       eth_hw_addr_set(ndev, ar->mac_addr);
        if (fw_vif_idx != 0) {
                ndev->dev_addr[0] = (ndev->dev_addr[0] ^ (1 << fw_vif_idx)) |
                                     0x2;

diff --git a/drivers/net/wireless/atmel/atmel.c b/drivers/net/wireless/atmel/atmel.c
index febce4e8b3dd37b09b9df3aa3faddbd522834fe4..3d782fabbfe6d504135b40f15c8b5fc314759606 100644 (file)
--- a/drivers/net/wireless/atmel/atmel.c
+++ b/drivers/net/wireless/atmel/atmel.c
@@ -3730,7 +3730,7 @@ static int probe_atmel_card(struct net_device *dev)
                                0x00, 0x04, 0x25, 0x00, 0x00, 0x00
                        };
                        printk(KERN_ALERT "%s: *** Invalid MAC address. UPGRADE Firmware ****\n", dev->name);
-                       memcpy(dev->dev_addr, default_mac, ETH_ALEN);
+                       eth_hw_addr_set(dev, default_mac);
                }
        }
 

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
index db5f8535fdb57a8b56ecf3c6a8de423ed1eab1d8..fed9cd5f29a26d091a6c0d667492e72a907ac155 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
@@ -244,7 +244,7 @@ static int brcmf_netdev_set_mac_address(struct net_device *ndev, void *addr)
        } else {
                brcmf_dbg(TRACE, "updated to %pM\n", sa->sa_data);
                memcpy(ifp->mac_addr, sa->sa_data, ETH_ALEN);
-               memcpy(ifp->ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
+               eth_hw_addr_set(ifp->ndev, ifp->mac_addr);
        }
        return err;
 }
@@ -655,7 +655,7 @@ int brcmf_net_attach(struct brcmf_if *ifp, bool locked)
        ndev->ethtool_ops = &brcmf_ethtool_ops;
 
        /* set the mac address & netns */
-       memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
+       eth_hw_addr_set(ndev, ifp->mac_addr);
        dev_net_set(ndev, wiphy_net(cfg_to_wiphy(drvr->config)));
 
        INIT_WORK(&ifp->multicast_work, _brcmf_set_multicast_list);
@@ -830,7 +830,7 @@ static int brcmf_net_p2p_attach(struct brcmf_if *ifp)
        ndev->netdev_ops = &brcmf_netdev_ops_p2p;
 
        /* set the mac address */
-       memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
+       eth_hw_addr_set(ndev, ifp->mac_addr);
 
        if (register_netdev(ndev) != 0) {
                bphy_err(drvr, "couldn't register the p2p net device\n");

diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
index 47eb89b773cf7f6a79bf87ae67f81c13191eb931..2ace2b27ecad280b77578bf62d93d572ffe02903 100644 (file)
--- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
@@ -4685,7 +4685,7 @@ static int ipw2100_read_mac_address(struct ipw2100_priv *priv)
                return -EIO;
        }
 
-       memcpy(priv->net_dev->dev_addr, addr, ETH_ALEN);
+       eth_hw_addr_set(priv->net_dev, addr);
        IPW_DEBUG_INFO("card MAC is %pM\n", priv->net_dev->dev_addr);
 
        return 0;
@@ -4712,7 +4712,7 @@ static int ipw2100_set_mac_address(struct ipw2100_priv *priv, int batch_mode)
 
        if (priv->config & CFG_CUSTOM_MAC) {
                memcpy(cmd.host_command_parameters, priv->mac_addr, ETH_ALEN);
-               memcpy(priv->net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
+               eth_hw_addr_set(priv->net_dev, priv->mac_addr);
        } else
                memcpy(cmd.host_command_parameters, priv->net_dev->dev_addr,
                       ETH_ALEN);

diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
index 9a99f482c84a2edb2a6152fa048264cf49458ca1..0a38d17744a9dbaadbc75773f31e41e4d80cd17e 100644 (file)
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
@@ -11185,7 +11185,7 @@ static int ipw_up(struct ipw_priv *priv)
                ipw_init_ordinals(priv);
                if (!(priv->config & CFG_CUSTOM_MAC))
                        eeprom_parse_mac(priv, priv->mac_addr);
-               memcpy(priv->net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
+               eth_hw_addr_set(priv->net_dev, priv->mac_addr);
 
                ipw_set_geo(priv);
 
@@ -11542,7 +11542,7 @@ static int ipw_prom_alloc(struct ipw_priv *priv)
        priv->prom_priv->priv = priv;
 
        strcpy(priv->prom_net_dev->name, "rtap%d");
-       memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
+       eth_hw_addr_set(priv->prom_net_dev, priv->mac_addr);
 
        priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP;
        priv->prom_net_dev->netdev_ops = &ipw_prom_netdev_ops;

diff --git a/drivers/net/wireless/intersil/hostap/hostap_main.c b/drivers/net/wireless/intersil/hostap/hostap_main.c
index 54f67b682b6a0b99d9a4a289cc4343c9a39ab9eb..787f685e70b49255806f7434c5e1ba744387da1e 100644 (file)
--- a/drivers/net/wireless/intersil/hostap/hostap_main.c
+++ b/drivers/net/wireless/intersil/hostap/hostap_main.c
@@ -713,9 +713,9 @@ static int prism2_set_mac_address(struct net_device *dev, void *p)
        read_lock_bh(&local->iface_lock);
        list_for_each(ptr, &local->hostap_interfaces) {
                iface = list_entry(ptr, struct hostap_interface, list);
-               memcpy(iface->dev->dev_addr, addr->sa_data, ETH_ALEN);
+               eth_hw_addr_set(iface->dev, addr->sa_data);
        }
-       memcpy(local->dev->dev_addr, addr->sa_data, ETH_ALEN);
+       eth_hw_addr_set(local->dev, addr->sa_data);
        read_unlock_bh(&local->iface_lock);
 
        return 0;

diff --git a/drivers/net/wireless/intersil/orinoco/main.c b/drivers/net/wireless/intersil/orinoco/main.c
index 0e73a10cc06c4493c9c6e44193136b7783e07228..7df88d20ff3dc7c1451d6cfaec3cd5ddc50f3371 100644 (file)
--- a/drivers/net/wireless/intersil/orinoco/main.c
+++ b/drivers/net/wireless/intersil/orinoco/main.c
@@ -2265,7 +2265,7 @@ int orinoco_if_add(struct orinoco_private *priv,
 
        netif_carrier_off(dev);
 
-       memcpy(dev->dev_addr, wiphy->perm_addr, ETH_ALEN);
+       eth_hw_addr_set(dev, wiphy->perm_addr);
 
        dev->base_addr = base_addr;
        dev->irq = irq;

diff --git a/drivers/net/wireless/marvell/libertas/cmd.c b/drivers/net/wireless/marvell/libertas/cmd.c
index a4d9dd73b258866a09ed8fef67be9722e06c1c95..104d2b6dc9af6ec2add89b5c32e08c835033ebc6 100644 (file)
--- a/drivers/net/wireless/marvell/libertas/cmd.c
+++ b/drivers/net/wireless/marvell/libertas/cmd.c
@@ -150,10 +150,9 @@ int lbs_update_hw_spec(struct lbs_private *priv)
                memmove(priv->current_addr, cmd.permanentaddr, ETH_ALEN);
 
        if (!priv->copied_hwaddr) {
-               memcpy(priv->dev->dev_addr, priv->current_addr, ETH_ALEN);
+               eth_hw_addr_set(priv->dev, priv->current_addr);
                if (priv->mesh_dev)
-                       memcpy(priv->mesh_dev->dev_addr,
-                               priv->current_addr, ETH_ALEN);
+                       eth_hw_addr_set(priv->mesh_dev, priv->current_addr);
                priv->copied_hwaddr = 1;
        }
 

diff --git a/drivers/net/wireless/marvell/libertas/main.c b/drivers/net/wireless/marvell/libertas/main.c
index 64fc5e41086482c376e7dd0e3814d0ba33fc60c5..5c9f295536ead9f59ed8ce0923dceb6434249b0e 100644 (file)
--- a/drivers/net/wireless/marvell/libertas/main.c
+++ b/drivers/net/wireless/marvell/libertas/main.c
@@ -302,9 +302,9 @@ int lbs_set_mac_address(struct net_device *dev, void *addr)
        dev = priv->dev;
 
        memcpy(priv->current_addr, phwaddr->sa_data, ETH_ALEN);
-       memcpy(dev->dev_addr, phwaddr->sa_data, ETH_ALEN);
+       eth_hw_addr_set(dev, phwaddr->sa_data);
        if (priv->mesh_dev)
-               memcpy(priv->mesh_dev->dev_addr, phwaddr->sa_data, ETH_ALEN);
+               eth_hw_addr_set(priv->mesh_dev, phwaddr->sa_data);
 
        return ret;
 }

diff --git a/drivers/net/wireless/marvell/mwifiex/uap_event.c b/drivers/net/wireless/marvell/mwifiex/uap_event.c
index 9121447e270184fab9a1c9f4ccbfe4d13fc26841..2e25d72dcac563e8f8d14637084d1dc26a1431cf 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/uap_event.c
+++ b/drivers/net/wireless/marvell/mwifiex/uap_event.c
@@ -197,8 +197,7 @@ int mwifiex_process_uap_event(struct mwifiex_private *priv)
                mwifiex_dbg(adapter, EVENT,
                            "AP EVENT: event id: %#x\n", eventcause);
                priv->port_open = false;
-               memcpy(priv->netdev->dev_addr, adapter->event_body + 2,
-                      ETH_ALEN);
+               eth_hw_addr_set(priv->netdev, adapter->event_body + 2);
                if (priv->hist_data)
                        mwifiex_hist_data_reset(priv);
                mwifiex_check_uap_capabilities(priv, adapter->event_skb);

diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.c b/drivers/net/wireless/quantenna/qtnfmac/core.c
index 01725237836e8d4aaf08cc2c2e344d2353893114..907a1c2c1b6dfeb4a7498e2d707ee35a7138d038 100644 (file)
--- a/drivers/net/wireless/quantenna/qtnfmac/core.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/core.c
@@ -179,7 +179,7 @@ static int qtnf_netdev_set_mac_address(struct net_device *ndev, void *addr)
                                             sa->sa_data);
 
        if (ret)
-               memcpy(ndev->dev_addr, old_addr, ETH_ALEN);
+               eth_hw_addr_set(ndev, old_addr);
 
        return ret;
 }