staging: use eth_hw_addr_set() instead of ether_addr_copy()

Commit 406f42fa0d3c ("net-next: When a bond have a massive amount
of VLANs...") introduced a rbtree for faster Ethernet address look
up. To maintain netdev->dev_addr in this tree we need to make all
the writes to it got through appropriate helpers.

Convert staging from ether_addr_copy() to eth_hw_addr_set():

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

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Link: https://lore.kernel.org/r/20211019171243.1412240-3-kuba@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c
index eaa70893224a1e2c06220f5e946a9e308136ee1b..1c63d595313df8202e4ac30abb2982ce54df5deb 100644 (file)
--- a/drivers/staging/ks7010/ks_hostif.c
+++ b/drivers/staging/ks7010/ks_hostif.c
@@ -541,7 +541,7 @@ void hostif_mib_get_confirm(struct ks_wlan_private *priv)
                hostif_sme_enqueue(priv, SME_GET_MAC_ADDRESS);
                ether_addr_copy(priv->eth_addr, priv->rxp);
                priv->mac_address_valid = true;
-               ether_addr_copy(dev->dev_addr, priv->eth_addr);
+               eth_hw_addr_set(dev, priv->eth_addr);
                netdev_info(dev, "MAC ADDRESS = %pM\n", priv->eth_addr);
                break;
        case DOT11_PRODUCT_VERSION:

diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c
index 631ad769c3d5675e99e6af4fa172590c8504a9c6..61d8f40e2739ff744dbed3c0e3d44845fb3c671f 100644 (file)
--- a/drivers/staging/ks7010/ks_wlan_net.c
+++ b/drivers/staging/ks7010/ks_wlan_net.c
@@ -2625,7 +2625,7 @@ int ks_wlan_net_start(struct net_device *dev)
 
        /* dummy address set */
        ether_addr_copy(priv->eth_addr, dummy_addr);
-       ether_addr_copy(dev->dev_addr, priv->eth_addr);
+       eth_hw_addr_set(dev, priv->eth_addr);
 
        /* The ks_wlan-specific entries in the device structure. */
        dev->netdev_ops = &ks_wlan_netdev_ops;

diff --git a/drivers/staging/most/net/net.c b/drivers/staging/most/net/net.c
index a5fd14246046e7933d838271f09cf8fe6577a9c9..47039f0d262f774508157adf274b629258da6f85 100644 (file)
--- a/drivers/staging/most/net/net.c
+++ b/drivers/staging/most/net/net.c
@@ -564,7 +564,7 @@ static void on_netinfo(struct most_interface *iface,
        if (m && is_valid_ether_addr(m)) {
                if (!is_valid_ether_addr(dev->dev_addr)) {
                        netdev_info(dev, "set mac %pM\n", m);
-                       ether_addr_copy(dev->dev_addr, m);
+                       eth_hw_addr_set(dev, m);
                        netif_dormant_off(dev);
                } else if (!ether_addr_equal(dev->dev_addr, m)) {
                        netdev_warn(dev, "reject mac %pM\n", m);

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index 358b629d2cc64c748c07c09d5675c535a4154376..cfeaa9c1542f347fce0d2639daa9fcca8f910668 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -366,7 +366,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
                        *(u16 *)(&dev->dev_addr[i]) = usValue;
                }
        } else {
-               ether_addr_copy(dev->dev_addr, bMac_Tmp_Addr);
+               eth_hw_addr_set(dev, bMac_Tmp_Addr);
        }
 
        RT_TRACE(COMP_INIT, "Permanent Address = %pM\n",

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index a7dd1578b2c6a913fadadc28016339bab23ffd03..d2e9df60e9baff9c96d5505e1dd7390787ea4ab6 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -2235,7 +2235,7 @@ static int _rtl92e_set_mac_adr(struct net_device *dev, void *mac)
 
        mutex_lock(&priv->wx_mutex);
 
-       ether_addr_copy(dev->dev_addr, addr->sa_data);
+       eth_hw_addr_set(dev, addr->sa_data);
 
        schedule_work(&priv->reset_wq);
        mutex_unlock(&priv->wx_mutex);

diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index 2aaba44d84e2bbb16a7cd69d216ce6519b11146c..3718d72e217e7c026a2e7519f5907b816d74a9a8 100644 (file)
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -3454,7 +3454,7 @@ static int r8192_set_mac_adr(struct net_device *dev, void *mac)
 
        mutex_lock(&priv->wx_mutex);
 
-       ether_addr_copy(dev->dev_addr, addr->sa_data);
+       eth_hw_addr_set(dev, addr->sa_data);
 
        schedule_work(&priv->reset_wq);
        mutex_unlock(&priv->wx_mutex);

diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c
index 2d3233a650fca4bb7bfd37b716bd65eec2ed39e9..beb9137c198cfb1cb424c0d2f7607c203b424c34 100644 (file)
--- a/drivers/staging/rtl8712/os_intfs.c
+++ b/drivers/staging/rtl8712/os_intfs.c
@@ -166,7 +166,7 @@ static int r871x_net_set_mac_address(struct net_device *pnetdev, void *p)
        struct sockaddr *addr = p;
 
        if (!padapter->bup)
-               ether_addr_copy(pnetdev->dev_addr, addr->sa_data);
+               eth_hw_addr_set(pnetdev, addr->sa_data);
        return 0;
 }
 

diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
index 505ebeb643dc296024895e6284a13e0f9abf7a3c..17e705411e648b00e88e981fcdf555e6eafda227 100644 (file)
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -563,7 +563,7 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
                        dev_info(&udev->dev,
                                "r8712u: MAC Address from efuse = %pM\n", mac);
                }
-               ether_addr_copy(pnetdev->dev_addr, mac);
+               eth_hw_addr_set(pnetdev, mac);
        }
        /* step 6. Load the firmware asynchronously */
        if (rtl871x_load_fw(padapter))