net: usb: 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 usb 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: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c
index 38cda590895cc0a0b9a956e3e116b42829f15d3f..42ba4af68090726eaf71750477b92b9bd16582ac 100644 (file)
--- a/drivers/net/usb/asix_common.c
+++ b/drivers/net/usb/asix_common.c
@@ -791,7 +791,7 @@ int asix_set_mac_address(struct net_device *net, void *p)
        if (!is_valid_ether_addr(addr->sa_data))
                return -EADDRNOTAVAIL;
 
-       memcpy(net->dev_addr, addr->sa_data, ETH_ALEN);
+       eth_hw_addr_set(net, addr->sa_data);
 
        /* We use the 20 byte dev->data
         * for our 6 byte mac buffer

diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
index 30821f6a6d7ac64263b8a5cf2515eb1fb7a553f0..4514d35ef4c48f72135713f78cdf371a730bfc65 100644 (file)
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -59,7 +59,7 @@ static void asix_status(struct usbnet *dev, struct urb *urb)
 static void asix_set_netdev_dev_addr(struct usbnet *dev, u8 *addr)
 {
        if (is_valid_ether_addr(addr)) {
-               memcpy(dev->net->dev_addr, addr, ETH_ALEN);
+               eth_hw_addr_set(dev->net, addr);
        } else {
                netdev_info(dev->net, "invalid hw address, using random\n");
                eth_hw_addr_random(dev->net);

diff --git a/drivers/net/usb/ax88172a.c b/drivers/net/usb/ax88172a.c
index d9777d9a7c5dfea7ad0bb5a81f81165ac47a8748..3777c7e2e6fc00f30481f76d4c75ef058e553874 100644 (file)
--- a/drivers/net/usb/ax88172a.c
+++ b/drivers/net/usb/ax88172a.c
@@ -176,7 +176,7 @@ static int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf)
                ret = -EIO;
                goto free;
        }
-       memcpy(dev->net->dev_addr, buf, ETH_ALEN);
+       eth_hw_addr_set(dev->net, buf);
 
        dev->net->netdev_ops = &ax88172a_netdev_ops;
        dev->net->ethtool_ops = &ax88172a_ethtool_ops;

diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c
index f25448a0887074102680d711161646039c8a9952..5ed59d9dd631e2547476a399a639d09e97b5678a 100644 (file)
--- a/drivers/net/usb/ax88179_178a.c
+++ b/drivers/net/usb/ax88179_178a.c
@@ -1015,7 +1015,7 @@ static int ax88179_set_mac_addr(struct net_device *net, void *p)
        if (!is_valid_ether_addr(addr->sa_data))
                return -EADDRNOTAVAIL;
 
-       memcpy(net->dev_addr, addr->sa_data, ETH_ALEN);
+       eth_hw_addr_set(net, addr->sa_data);
 
        /* Set the MAC address */
        ret = ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_NODE_ID, ETH_ALEN,
@@ -1310,7 +1310,7 @@ static void ax88179_get_mac_addr(struct usbnet *dev)
        }
 
        if (is_valid_ether_addr(mac)) {
-               memcpy(dev->net->dev_addr, mac, ETH_ALEN);
+               eth_hw_addr_set(dev->net, mac);
        } else {
                netdev_info(dev->net, "invalid MAC address, using random\n");
                eth_hw_addr_random(dev->net);

diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index 907f98b1eefee02679ee942a21b609ab99dba49a..f4b03202472d937725e1f4c110c9df1a124c01e1 100644 (file)
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -391,7 +391,7 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf)
         * Overwrite the auto-generated address only with good ones.
         */
        if (is_valid_ether_addr(mac))
-               memcpy(dev->net->dev_addr, mac, ETH_ALEN);
+               eth_hw_addr_set(dev->net, mac);
        else {
                printk(KERN_WARNING
                        "dm9601: No valid MAC address in EEPROM, using %pM\n",

diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
index 06e2181e58108ba84973b346f5ea9a3cac66bd53..cd33955df0b65f52ac16b9f7b689956fd6c1c92d 100644 (file)
--- a/drivers/net/usb/ipheth.c
+++ b/drivers/net/usb/ipheth.c
@@ -303,7 +303,7 @@ static int ipheth_get_macaddr(struct ipheth_device *dev)
                        __func__, retval);
                retval = -EINVAL;
        } else {
-               memcpy(net->dev_addr, dev->ctrl_buf, ETH_ALEN);
+               eth_hw_addr_set(net, dev->ctrl_buf);
                retval = 0;
        }
 

diff --git a/drivers/net/usb/kalmia.c b/drivers/net/usb/kalmia.c
index fc5895f85cee2f8256661f37de0802054826d421..9f2b70ef39aa1b5032cb9001f7caad7a9fc7da79 100644 (file)
--- a/drivers/net/usb/kalmia.c
+++ b/drivers/net/usb/kalmia.c
@@ -149,7 +149,7 @@ kalmia_bind(struct usbnet *dev, struct usb_interface *intf)
        if (status)
                return status;
 
-       memcpy(dev->net->dev_addr, ethernet_addr, ETH_ALEN);
+       eth_hw_addr_set(dev->net, ethernet_addr);
 
        return status;
 }

diff --git a/drivers/net/usb/sr9800.c b/drivers/net/usb/sr9800.c
index 576401c8b1beee1bad174f07b1db8bc4128b7a6a..838f4e9e8b58fafb4e53759b3c645b0967fa7d2f 100644 (file)
--- a/drivers/net/usb/sr9800.c
+++ b/drivers/net/usb/sr9800.c
@@ -503,7 +503,7 @@ static int sr_set_mac_address(struct net_device *net, void *p)
        if (!is_valid_ether_addr(addr->sa_data))
                return -EADDRNOTAVAIL;
 
-       memcpy(net->dev_addr, addr->sa_data, ETH_ALEN);
+       eth_hw_addr_set(net, addr->sa_data);
 
        /* We use the 20 byte dev->data
         * for our 6 byte mac buffer