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

Commit 33eaf2a6 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net: Add extack to ndo_add_slave 



Pass extack to do_set_master and down to ndo_add_slave

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 51d0c047

drivers/net/bonding/bond_main.c

+3 −2
Original line number Diff line number Diff line
@@ -1328,7 +1328,8 @@ void bond_lower_state_changed(struct slave *slave) 
}



/* enslave device <slave> to bond device <master> */

int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)

int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,

		 struct netlink_ext_ack *extack)

{

	struct bonding *bond = netdev_priv(bond_dev);

	const struct net_device_ops *slave_ops = slave_dev->netdev_ops;
@@ -3492,7 +3493,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd 
	switch (cmd) {

	case BOND_ENSLAVE_OLD:

	case SIOCBONDENSLAVE:

		res = bond_enslave(bond_dev, slave_dev);

		res = bond_enslave(bond_dev, slave_dev, NULL);

		break;

	case BOND_RELEASE_OLD:

	case SIOCBONDRELEASE:

drivers/net/bonding/bond_options.c

+1 −1
Original line number Diff line number Diff line
@@ -1383,7 +1383,7 @@ static int bond_option_slaves_set(struct bonding *bond, 
	switch (command[0]) {

	case '+':

		netdev_dbg(bond->dev, "Adding slave %s\n", dev->name);

		ret = bond_enslave(bond->dev, dev);

		ret = bond_enslave(bond->dev, dev, NULL);

		break;



	case '-':

drivers/net/team/team.c

+2 −1
Original line number Diff line number Diff line
@@ -1914,7 +1914,8 @@ static int team_netpoll_setup(struct net_device *dev, 
}

#endif



static int team_add_slave(struct net_device *dev, struct net_device *port_dev)

static int team_add_slave(struct net_device *dev, struct net_device *port_dev,

			  struct netlink_ext_ack *extack)

{

	struct team *team = netdev_priv(dev);

	int err;

drivers/net/vrf.c

+2 −1
Original line number Diff line number Diff line
@@ -788,7 +788,8 @@ static int do_vrf_add_slave(struct net_device *dev, struct net_device *port_dev) 
	return ret;

}



static int vrf_add_slave(struct net_device *dev, struct net_device *port_dev)

static int vrf_add_slave(struct net_device *dev, struct net_device *port_dev,

			 struct netlink_ext_ack *extack)

{

	if (netif_is_l3_master(port_dev) || netif_is_l3_slave(port_dev))

		return -EINVAL;

include/linux/netdevice.h

+2 −1
Original line number Diff line number Diff line
@@ -1246,7 +1246,8 @@ struct net_device_ops { 
						     u32 flow_id);

#endif

	int			(*ndo_add_slave)(struct net_device *dev,

						 struct net_device *slave_dev);

						 struct net_device *slave_dev,

						 struct netlink_ext_ack *extack);

	int			(*ndo_del_slave)(struct net_device *dev,

						 struct net_device *slave_dev);

	netdev_features_t	(*ndo_fix_features)(struct net_device *dev,