Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Jakub Kicinski and committed by
Kalle Valo
708884e7 8bf26aa1

+18 -20
+1 -1
drivers/net/wireless/ath/ath6kl/cfg80211.c
··· 3803 3803 vif->htcap[NL80211_BAND_2GHZ].ht_enable = true; 3804 3804 vif->htcap[NL80211_BAND_5GHZ].ht_enable = true; 3805 3805 3806 - memcpy(ndev->dev_addr, ar->mac_addr, ETH_ALEN); 3806 + eth_hw_addr_set(ndev, ar->mac_addr); 3807 3807 if (fw_vif_idx != 0) { 3808 3808 ndev->dev_addr[0] = (ndev->dev_addr[0] ^ (1 << fw_vif_idx)) | 3809 3809 0x2;
+1 -1
drivers/net/wireless/atmel/atmel.c
··· 3730 3730 0x00, 0x04, 0x25, 0x00, 0x00, 0x00 3731 3731 }; 3732 3732 printk(KERN_ALERT "%s: *** Invalid MAC address. UPGRADE Firmware ****\n", dev->name); 3733 - memcpy(dev->dev_addr, default_mac, ETH_ALEN); 3733 + eth_hw_addr_set(dev, default_mac); 3734 3734 } 3735 3735 } 3736 3736
+3 -3
drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
··· 244 244 } else { 245 245 brcmf_dbg(TRACE, "updated to %pM\n", sa->sa_data); 246 246 memcpy(ifp->mac_addr, sa->sa_data, ETH_ALEN); 247 - memcpy(ifp->ndev->dev_addr, ifp->mac_addr, ETH_ALEN); 247 + eth_hw_addr_set(ifp->ndev, ifp->mac_addr); 248 248 } 249 249 return err; 250 250 } ··· 655 655 ndev->ethtool_ops = &brcmf_ethtool_ops; 656 656 657 657 /* set the mac address & netns */ 658 - memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN); 658 + eth_hw_addr_set(ndev, ifp->mac_addr); 659 659 dev_net_set(ndev, wiphy_net(cfg_to_wiphy(drvr->config))); 660 660 661 661 INIT_WORK(&ifp->multicast_work, _brcmf_set_multicast_list); ··· 830 830 ndev->netdev_ops = &brcmf_netdev_ops_p2p; 831 831 832 832 /* set the mac address */ 833 - memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN); 833 + eth_hw_addr_set(ndev, ifp->mac_addr); 834 834 835 835 if (register_netdev(ndev) != 0) { 836 836 bphy_err(drvr, "couldn't register the p2p net device\n");
+2 -2
drivers/net/wireless/intel/ipw2x00/ipw2100.c
··· 4685 4685 return -EIO; 4686 4686 } 4687 4687 4688 - memcpy(priv->net_dev->dev_addr, addr, ETH_ALEN); 4688 + eth_hw_addr_set(priv->net_dev, addr); 4689 4689 IPW_DEBUG_INFO("card MAC is %pM\n", priv->net_dev->dev_addr); 4690 4690 4691 4691 return 0; ··· 4712 4712 4713 4713 if (priv->config & CFG_CUSTOM_MAC) { 4714 4714 memcpy(cmd.host_command_parameters, priv->mac_addr, ETH_ALEN); 4715 - memcpy(priv->net_dev->dev_addr, priv->mac_addr, ETH_ALEN); 4715 + eth_hw_addr_set(priv->net_dev, priv->mac_addr); 4716 4716 } else 4717 4717 memcpy(cmd.host_command_parameters, priv->net_dev->dev_addr, 4718 4718 ETH_ALEN);
+2 -2
drivers/net/wireless/intel/ipw2x00/ipw2200.c
··· 11185 11185 ipw_init_ordinals(priv); 11186 11186 if (!(priv->config & CFG_CUSTOM_MAC)) 11187 11187 eeprom_parse_mac(priv, priv->mac_addr); 11188 - memcpy(priv->net_dev->dev_addr, priv->mac_addr, ETH_ALEN); 11188 + eth_hw_addr_set(priv->net_dev, priv->mac_addr); 11189 11189 11190 11190 ipw_set_geo(priv); 11191 11191 ··· 11542 11542 priv->prom_priv->priv = priv; 11543 11543 11544 11544 strcpy(priv->prom_net_dev->name, "rtap%d"); 11545 - memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN); 11545 + eth_hw_addr_set(priv->prom_net_dev, priv->mac_addr); 11546 11546 11547 11547 priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP; 11548 11548 priv->prom_net_dev->netdev_ops = &ipw_prom_netdev_ops;
+2 -2
drivers/net/wireless/intersil/hostap/hostap_main.c
··· 713 713 read_lock_bh(&local->iface_lock); 714 714 list_for_each(ptr, &local->hostap_interfaces) { 715 715 iface = list_entry(ptr, struct hostap_interface, list); 716 - memcpy(iface->dev->dev_addr, addr->sa_data, ETH_ALEN); 716 + eth_hw_addr_set(iface->dev, addr->sa_data); 717 717 } 718 - memcpy(local->dev->dev_addr, addr->sa_data, ETH_ALEN); 718 + eth_hw_addr_set(local->dev, addr->sa_data); 719 719 read_unlock_bh(&local->iface_lock); 720 720 721 721 return 0;
+1 -1
drivers/net/wireless/intersil/orinoco/main.c
··· 2265 2265 2266 2266 netif_carrier_off(dev); 2267 2267 2268 - memcpy(dev->dev_addr, wiphy->perm_addr, ETH_ALEN); 2268 + eth_hw_addr_set(dev, wiphy->perm_addr); 2269 2269 2270 2270 dev->base_addr = base_addr; 2271 2271 dev->irq = irq;
+2 -3
drivers/net/wireless/marvell/libertas/cmd.c
··· 150 150 memmove(priv->current_addr, cmd.permanentaddr, ETH_ALEN); 151 151 152 152 if (!priv->copied_hwaddr) { 153 - memcpy(priv->dev->dev_addr, priv->current_addr, ETH_ALEN); 153 + eth_hw_addr_set(priv->dev, priv->current_addr); 154 154 if (priv->mesh_dev) 155 - memcpy(priv->mesh_dev->dev_addr, 156 - priv->current_addr, ETH_ALEN); 155 + eth_hw_addr_set(priv->mesh_dev, priv->current_addr); 157 156 priv->copied_hwaddr = 1; 158 157 } 159 158
+2 -2
drivers/net/wireless/marvell/libertas/main.c
··· 302 302 dev = priv->dev; 303 303 304 304 memcpy(priv->current_addr, phwaddr->sa_data, ETH_ALEN); 305 - memcpy(dev->dev_addr, phwaddr->sa_data, ETH_ALEN); 305 + eth_hw_addr_set(dev, phwaddr->sa_data); 306 306 if (priv->mesh_dev) 307 - memcpy(priv->mesh_dev->dev_addr, phwaddr->sa_data, ETH_ALEN); 307 + eth_hw_addr_set(priv->mesh_dev, phwaddr->sa_data); 308 308 309 309 return ret; 310 310 }
+1 -2
drivers/net/wireless/marvell/mwifiex/uap_event.c
··· 197 197 mwifiex_dbg(adapter, EVENT, 198 198 "AP EVENT: event id: %#x\n", eventcause); 199 199 priv->port_open = false; 200 - memcpy(priv->netdev->dev_addr, adapter->event_body + 2, 201 - ETH_ALEN); 200 + eth_hw_addr_set(priv->netdev, adapter->event_body + 2); 202 201 if (priv->hist_data) 203 202 mwifiex_hist_data_reset(priv); 204 203 mwifiex_check_uap_capabilities(priv, adapter->event_skb);
+1 -1
drivers/net/wireless/quantenna/qtnfmac/core.c
··· 179 179 sa->sa_data); 180 180 181 181 if (ret) 182 - memcpy(ndev->dev_addr, old_addr, ETH_ALEN); 182 + eth_hw_addr_set(ndev, old_addr); 183 183 184 184 return ret; 185 185 }