Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a37a963 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

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: default avatarPetr Machata <petrm@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 95302c39

drivers/net/bonding/bond_alb.c

+5 −4
Original line number Diff line number Diff line
@@ -1031,7 +1031,7 @@ static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[], 
	 */

	memcpy(ss.__data, addr, len);

	ss.ss_family = dev->type;

	if (dev_set_mac_address(dev, (struct sockaddr *)&ss)) {

	if (dev_set_mac_address(dev, (struct sockaddr *)&ss, NULL)) {

		netdev_err(slave->bond->dev, "dev_set_mac_address of dev %s failed! ALB mode requires that the base driver support setting the hw address also when the network device's interface is open\n",

			   dev->name);

		return -EOPNOTSUPP;
@@ -1250,7 +1250,7 @@ static int alb_set_mac_address(struct bonding *bond, void *addr) 
		bond_hw_addr_copy(tmp_addr, slave->dev->dev_addr,

				  slave->dev->addr_len);



		res = dev_set_mac_address(slave->dev, addr);

		res = dev_set_mac_address(slave->dev, addr, NULL);



		/* restore net_device's hw address */

		bond_hw_addr_copy(slave->dev->dev_addr, tmp_addr,
@@ -1273,7 +1273,7 @@ static int alb_set_mac_address(struct bonding *bond, void *addr) 
		bond_hw_addr_copy(tmp_addr, rollback_slave->dev->dev_addr,

				  rollback_slave->dev->addr_len);

		dev_set_mac_address(rollback_slave->dev,

				    (struct sockaddr *)&ss);

				    (struct sockaddr *)&ss, NULL);

		bond_hw_addr_copy(rollback_slave->dev->dev_addr, tmp_addr,

				  rollback_slave->dev->addr_len);

	}
@@ -1732,7 +1732,8 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave 
				  bond->dev->addr_len);

		ss.ss_family = bond->dev->type;

		/* we don't care if it can't change its mac, best effort */

		dev_set_mac_address(new_slave->dev, (struct sockaddr *)&ss);

		dev_set_mac_address(new_slave->dev, (struct sockaddr *)&ss,

				    NULL);



		bond_hw_addr_copy(new_slave->dev->dev_addr, tmp_addr,

				  new_slave->dev->addr_len);

drivers/net/bonding/bond_main.c

+8 −7
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ static void bond_do_fail_over_mac(struct bonding *bond, 
		}



		rv = dev_set_mac_address(new_active->dev,

					 (struct sockaddr *)&ss);

					 (struct sockaddr *)&ss, NULL);

		if (rv) {

			netdev_err(bond->dev, "Error %d setting MAC of slave %s\n",

				   -rv, new_active->dev->name);
@@ -695,7 +695,7 @@ static void bond_do_fail_over_mac(struct bonding *bond, 
		ss.ss_family = old_active->dev->type;



		rv = dev_set_mac_address(old_active->dev,

					 (struct sockaddr *)&ss);

					 (struct sockaddr *)&ss, NULL);

		if (rv)

			netdev_err(bond->dev, "Error %d setting MAC of slave %s\n",

				   -rv, new_active->dev->name);
@@ -1527,7 +1527,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, 
		 */

		memcpy(ss.__data, bond_dev->dev_addr, bond_dev->addr_len);

		ss.ss_family = slave_dev->type;

		res = dev_set_mac_address(slave_dev, (struct sockaddr *)&ss);

		res = dev_set_mac_address(slave_dev, (struct sockaddr *)&ss,

					  extack);

		if (res) {

			netdev_dbg(bond_dev, "Error %d calling set_mac_address\n", res);

			goto err_restore_mtu;
@@ -1818,7 +1819,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, 
		bond_hw_addr_copy(ss.__data, new_slave->perm_hwaddr,

				  new_slave->dev->addr_len);

		ss.ss_family = slave_dev->type;

		dev_set_mac_address(slave_dev, (struct sockaddr *)&ss);

		dev_set_mac_address(slave_dev, (struct sockaddr *)&ss, NULL);

	}



err_restore_mtu:
@@ -1999,7 +2000,7 @@ static int __bond_release_one(struct net_device *bond_dev, 
		bond_hw_addr_copy(ss.__data, slave->perm_hwaddr,

				  slave->dev->addr_len);

		ss.ss_family = slave_dev->type;

		dev_set_mac_address(slave_dev, (struct sockaddr *)&ss);

		dev_set_mac_address(slave_dev, (struct sockaddr *)&ss, NULL);

	}



	if (unregister)
@@ -3732,7 +3733,7 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr) 


	bond_for_each_slave(bond, slave, iter) {

		netdev_dbg(bond_dev, "slave %p %s\n", slave, slave->dev->name);

		res = dev_set_mac_address(slave->dev, addr);

		res = dev_set_mac_address(slave->dev, addr, NULL);

		if (res) {

			/* TODO: consider downing the slave

			 * and retry ?
@@ -3761,7 +3762,7 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr) 
			break;



		tmp_res = dev_set_mac_address(rollback_slave->dev,

					      (struct sockaddr *)&tmp_ss);

					      (struct sockaddr *)&tmp_ss, NULL);

		if (tmp_res) {

			netdev_dbg(bond_dev, "unwind err %d dev %s\n",

				   tmp_res, rollback_slave->dev->name);

drivers/net/hyperv/netvsc_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -1247,7 +1247,7 @@ static int netvsc_set_mac_addr(struct net_device *ndev, void *p) 
		return -ENODEV;



	if (vf_netdev) {

		err = dev_set_mac_address(vf_netdev, addr);

		err = dev_set_mac_address(vf_netdev, addr, NULL);

		if (err)

			return err;

	}
@@ -1258,7 +1258,7 @@ static int netvsc_set_mac_addr(struct net_device *ndev, void *p) 
	} else if (vf_netdev) {

		/* rollback change on VF */

		memcpy(addr->sa_data, ndev->dev_addr, ETH_ALEN);

		dev_set_mac_address(vf_netdev, addr);

		dev_set_mac_address(vf_netdev, addr, NULL);

	}



	return err;

drivers/net/macvlan.c

+2 −2
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ static int macvlan_set_mac_address(struct net_device *dev, void *p) 


	if (vlan->mode == MACVLAN_MODE_PASSTHRU) {

		macvlan_set_addr_change(vlan->port);

		return dev_set_mac_address(vlan->lowerdev, addr);

		return dev_set_mac_address(vlan->lowerdev, addr, NULL);

	}



	if (macvlan_addr_busy(vlan->port, addr->sa_data))
@@ -1213,7 +1213,7 @@ static void macvlan_port_destroy(struct net_device *dev) 


		sa.sa_family = port->dev->type;

		memcpy(&sa.sa_data, port->perm_addr, port->dev->addr_len);

		dev_set_mac_address(port->dev, &sa);

		dev_set_mac_address(port->dev, &sa, NULL);

	}



	kfree(port);

drivers/net/tap.c

+1 −1
Original line number Diff line number Diff line
@@ -1113,7 +1113,7 @@ static long tap_ioctl(struct file *file, unsigned int cmd, 
			rtnl_unlock();

			return -ENOLINK;

		}

		ret = dev_set_mac_address(tap->dev, &sa);

		ret = dev_set_mac_address(tap->dev, &sa, NULL);

		tap_put_tap_dev(tap);

		rtnl_unlock();

		return ret;