macvlan: Do not return error when setting the same mac address
authorVlad Yasevich <vyasevich@gmail.com>
Wed, 21 Jun 2017 11:59:16 +0000 (07:59 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 Jun 2017 15:17:41 +0000 (11:17 -0400)
The user currently gets an EBUSY error when attempting to set
the mac address on a macvlan device to the same value.

This should really be a no-op as nothing changes.  Catch
the condition and return early.

Signed-off-by: Vladislav Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/macvlan.c

index 67bf7ebae5c6dba9b9ea28c0c9c0801093f55eb7..de214fbda173f63f7f1afcfb6bbd536155d33710 100644 (file)
@@ -703,6 +703,10 @@ static int macvlan_set_mac_address(struct net_device *dev, void *p)
        if (!is_valid_ether_addr(addr->sa_data))
                return -EADDRNOTAVAIL;
 
+       /* If the addresses are the same, this is a no-op */
+       if (ether_addr_equal(dev->dev_addr, addr->sa_data))
+               return 0;
+
        if (vlan->mode == MACVLAN_MODE_PASSTHRU) {
                dev_set_mac_address(vlan->lowerdev, addr);
                return 0;