Commit 6ed178cb authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Greg Kroah-Hartman
Browse files

staging: use eth_hw_addr_set() 



Commit 406f42fa ("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: default avatarJakub Kicinski <kuba@kernel.org>
Link: https://lore.kernel.org/r/20211019171243.1412240-2-kuba@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 07e00148

drivers/staging/r8188eu/os_dep/osdep_service.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/r8188eu/os_dep/usb_intf.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/rtl8192u/r8192U_core.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/rtl8712/os_intfs.c

+2 −2
Original line number Diff line number Diff line
@@ -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.

drivers/staging/rtl8723bs/os_dep/os_intfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {