UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: usb: use eth_hw_addr_set() for dev->addr_len cases 

Convert usb drivers from memcpy(... dev->addr_len)
to eth_hw_addr_set():

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

Manually checked these are either usbnet or pure etherdevs.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2021-10-04 09:05:22 -07:00 committed by David S. Miller
parent a05e4c0af4
commit 49ed8dde37
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/usb/dm9601.c
View File

@ -331,7 +331,7 @@ static int dm9601_set_mac_address(struct net_device *net, void *p)
return -EINVAL; return -EINVAL;
} }
memcpy(net->dev_addr, addr->sa_data, net->addr_len); eth_hw_addr_set(net, addr->sa_data);
__dm9601_set_mac_address(dev); __dm9601_set_mac_address(dev);
return 0; return 0;

2
drivers/net/usb/mcs7830.c
View File

@ -159,7 +159,7 @@ static int mcs7830_set_mac_address(struct net_device *netdev, void *p)
return ret; return ret;
/* it worked --> adopt it on netdev side */ /* it worked --> adopt it on netdev side */
memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); eth_hw_addr_set(netdev, addr->sa_data);
return 0; return 0;
} }

2
drivers/net/usb/r8152.c
View File

@ -1570,7 +1570,7 @@ static int __rtl8152_set_mac_address(struct net_device *netdev, void *p,
mutex_lock(&tp->control); mutex_lock(&tp->control);
memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); eth_hw_addr_set(netdev, addr->sa_data);
ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG); ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG);
pla_ocp_write(tp, PLA_IDR, BYTE_EN_SIX_BYTES, 8, addr->sa_data); pla_ocp_write(tp, PLA_IDR, BYTE_EN_SIX_BYTES, 8, addr->sa_data);

2
drivers/net/usb/rtl8150.c
View File

@ -278,7 +278,7 @@ static int rtl8150_set_mac_address(struct net_device *netdev, void *p)
if (netif_running(netdev)) if (netif_running(netdev))
return -EBUSY; return -EBUSY;
memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); eth_hw_addr_set(netdev, addr->sa_data);
netdev_dbg(netdev, "Setting MAC address to %pM\n", netdev->dev_addr); netdev_dbg(netdev, "Setting MAC address to %pM\n", netdev->dev_addr);
/* Set the IDR registers. */ /* Set the IDR registers. */
set_registers(dev, IDR, netdev->addr_len, netdev->dev_addr); set_registers(dev, IDR, netdev->addr_len, netdev->dev_addr);

2
drivers/net/usb/sr9700.c
View File

@ -296,7 +296,7 @@ static int sr9700_set_mac_address(struct net_device *netdev, void *p)
return -EINVAL; return -EINVAL;
} }
memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); eth_hw_addr_set(netdev, addr->sa_data);
sr_write_async(dev, SR_PAR, 6, netdev->dev_addr); sr_write_async(dev, SR_PAR, 6, netdev->dev_addr);
return 0; return 0;