net: dev: Add extack argument to dev_set_mac_address()

A follow-up patch will add a notifier type NETDEV_PRE_CHANGEADDR, which
allows vetoing of MAC address changes. One prominent path to that
notification is through dev_set_mac_address(). Therefore give this
function an extack argument, so that it can be packed together with the
notification. Thus a textual reason for rejection (or a warning) can be
communicated back to the user.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 6 insertions, 4 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 754284873355..7250a3a73fa4 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -7759,10 +7759,12 @@ EXPORT_SYMBOL(dev_set_group);
  *      dev_set_mac_address - Change Media Access Control Address
  *      @dev: device
  *      @sa: new address
+ *      @extack: netlink extended ack
  *
  *      Change the hardware (MAC) address of the device
  */
-int dev_set_mac_address(struct net_device *dev, struct sockaddr *sa)
+int dev_set_mac_address(struct net_device *dev, struct sockaddr *sa,
+                        struct netlink_ext_ack *extack)
 {
         const struct net_device_ops *ops = dev->netdev_ops;
         int err;
diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
index da273ec3cc57..31380fd5a4e2 100644
--- a/net/core/dev_ioctl.c
+++ b/net/core/dev_ioctl.c
@@ -246,7 +246,7 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd)
         case SIOCSIFHWADDR:
                 if (dev->addr_len > sizeof(struct sockaddr))
                         return -EINVAL;
-                return dev_set_mac_address(dev, &ifr->ifr_hwaddr);
+                return dev_set_mac_address(dev, &ifr->ifr_hwaddr, NULL);
 
         case SIOCSIFHWBROADCAST:
                 if (ifr->ifr_hwaddr.sa_family != dev->type)
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 3b6e551f9e69..f8bdb8adab2c 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2444,7 +2444,7 @@ static int do_setlink(const struct sk_buff *skb,
                 sa->sa_family = dev->type;
                 memcpy(sa->sa_data, nla_data(tb[IFLA_ADDRESS]),
                        dev->addr_len);
-                err = dev_set_mac_address(dev, sa);
+                err = dev_set_mac_address(dev, sa, extack);
                 kfree(sa);
                 if (err)
                         goto errout;
diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c
index b231e40f006a..0c25c0bcc4da 100644
--- a/net/ieee802154/nl-phy.c
+++ b/net/ieee802154/nl-phy.c
@@ -242,7 +242,7 @@ int ieee802154_add_iface(struct sk_buff *skb, struct genl_info *info)
                  * dev_set_mac_address require RTNL_LOCK
                  */
                 rtnl_lock();
-                rc = dev_set_mac_address(dev, &addr);
+                rc = dev_set_mac_address(dev, &addr, NULL);
                 rtnl_unlock();
                 if (rc)
                         goto dev_unregister;