staging: use eth_hw_addr_set()

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 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)
  @@
  - memcpy(dev->dev_addr, np, 6)
  + eth_hw_addr_set(dev, np)

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

diff --git a/drivers/staging/r8188eu/os_dep/osdep_service.c b/drivers/staging/r8188eu/os_dep/osdep_service.c
index d7d03c1417fdce7d502aedc8ba9341ec470fcfbe..6bee194fc35d95ff9dbc6634a6b8689115894669 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/osdep_service.c
+++ b/drivers/staging/r8188eu/os_dep/osdep_service.c
@@ -175,7 +175,7 @@ int rtw_change_ifname(struct adapter *padapter, const char *ifname)
 
        rtw_init_netdev_name(pnetdev, ifname);
 
-       memcpy(pnetdev->dev_addr, padapter->eeprompriv.mac_addr, ETH_ALEN);
+       eth_hw_addr_set(pnetdev, padapter->eeprompriv.mac_addr);
 
        if (!rtnl_is_locked())
                ret = register_netdev(pnetdev);

diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c
index 4b8a3e821b748ac346ff92bb9f568283f56313d7..40f2481afc6ffbc219b283e60804f93a261a5a47 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/r8188eu/os_dep/usb_intf.c
@@ -406,7 +406,7 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
        rtw_macaddr_cfg(padapter->eeprompriv.mac_addr);
        rtw_init_wifidirect_addrs(padapter, padapter->eeprompriv.mac_addr,
                                  padapter->eeprompriv.mac_addr);
-       memcpy(pnetdev->dev_addr, padapter->eeprompriv.mac_addr, ETH_ALEN);
+       eth_hw_addr_set(pnetdev, padapter->eeprompriv.mac_addr);
        DBG_88E("MAC Address from pnetdev->dev_addr =  %pM\n",
                pnetdev->dev_addr);
 

diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index 594239990455a58db6a8f0c5394e8cdcbd7df3dd..2aaba44d84e2bbb16a7cd69d216ce6519b11146c 100644 (file)
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -2307,7 +2307,7 @@ static int rtl8192_read_eeprom_info(struct net_device *dev)
                        *(u16 *)(&dev->dev_addr[i]) = (u16)ret;
                }
        } else {
-               memcpy(dev->dev_addr, bMac_Tmp_Addr, 6);
+               eth_hw_addr_set(dev, bMac_Tmp_Addr);
                /* should I set IDR0 here? */
        }
        RT_TRACE(COMP_EPROM, "MAC addr:%pM\n", dev->dev_addr);

diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c
index 9502f6aa53060dfe66014f823aa6fdce19e99c4d..2d3233a650fca4bb7bfd37b716bd65eec2ed39e9 100644 (file)
--- a/drivers/staging/rtl8712/os_intfs.c
+++ b/drivers/staging/rtl8712/os_intfs.c
@@ -381,8 +381,8 @@ static int netdev_open(struct net_device *pnetdev)
                        goto netdev_open_error;
                if (!r8712_initmac) {
                        /* Use the mac address stored in the Efuse */
-                       memcpy(pnetdev->dev_addr,
-                              padapter->eeprompriv.mac_addr, ETH_ALEN);
+                       eth_hw_addr_set(pnetdev,
+                                       padapter->eeprompriv.mac_addr);
                } else {
                        /* We have to inform f/w to use user-supplied MAC
                         * address.

diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 1b8b76f147400865b991c76533294375ccb60038..719e75ee3fb27e112151e82ed781b06aa28e0093 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -789,7 +789,7 @@ static int _rtw_drv_register_netdev(struct adapter *padapter, char *name)
        if (rtw_init_netdev_name(pnetdev, name))
                return _FAIL;
 
-       memcpy(pnetdev->dev_addr, padapter->eeprompriv.mac_addr, ETH_ALEN);
+       eth_hw_addr_set(pnetdev, padapter->eeprompriv.mac_addr);
 
        /* Tell the network stack we exist */
        if (register_netdev(pnetdev) != 0) {

diff --git a/drivers/staging/rtl8723bs/os_dep/osdep_service.c b/drivers/staging/rtl8723bs/os_dep/osdep_service.c
index d6bddf7b08e8944f6e249be8f1014a3d578ef2b0..4fbfa75c05d74eb39be89227180a26ea62648fbb 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/osdep_service.c
+++ b/drivers/staging/rtl8723bs/os_dep/osdep_service.c
@@ -142,7 +142,7 @@ int rtw_change_ifname(struct adapter *padapter, const char *ifname)
 
        rtw_init_netdev_name(pnetdev, ifname);
 
-       memcpy(pnetdev->dev_addr, padapter->eeprompriv.mac_addr, ETH_ALEN);
+       eth_hw_addr_set(pnetdev, padapter->eeprompriv.mac_addr);
 
        if (!rtnl_is_locked())
                ret = register_netdev(pnetdev);