mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 02:19:51 +00:00
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
This commit is contained in:
parent
8bf26aa10a
commit
708884e7f7
11 changed files with 18 additions and 20 deletions
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue