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

Commit 42ab19ee authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net: Add extack to upper device linking 



Add extack arg to netdev_upper_dev_link and netdev_master_upper_dev_link

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

drivers/net/bonding/bond_main.c

+4 −3
Original line number Diff line number Diff line
@@ -1217,14 +1217,15 @@ static enum netdev_lag_tx_type bond_lag_tx_type(struct bonding *bond) 
	}

}



static int bond_master_upper_dev_link(struct bonding *bond, struct slave *slave)

static int bond_master_upper_dev_link(struct bonding *bond, struct slave *slave,

				      struct netlink_ext_ack *extack)

{

	struct netdev_lag_upper_info lag_upper_info;

	int err;



	lag_upper_info.tx_type = bond_lag_tx_type(bond);

	err = netdev_master_upper_dev_link(slave->dev, bond->dev, slave,

					   &lag_upper_info);

					   &lag_upper_info, extack);

	if (err)

		return err;

	rtmsg_ifinfo(RTM_NEWLINK, slave->dev, IFF_SLAVE, GFP_KERNEL);
@@ -1710,7 +1711,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, 
		goto err_detach;

	}



	res = bond_master_upper_dev_link(bond, new_slave);

	res = bond_master_upper_dev_link(bond, new_slave, extack);

	if (res) {

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

		goto err_unregister;

drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static int rmnet_newlink(struct net *src_net, struct net_device *dev, 
	if (err)

		goto err1;



	err = netdev_master_upper_dev_link(dev, real_dev, NULL, NULL);

	err = netdev_master_upper_dev_link(dev, real_dev, NULL, NULL, extack);

	if (err)

		goto err2;

drivers/net/hyperv/netvsc_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -1748,7 +1748,7 @@ static int netvsc_vf_join(struct net_device *vf_netdev, 
		goto rx_handler_failed;

	}



	ret = netdev_upper_dev_link(vf_netdev, ndev);

	ret = netdev_upper_dev_link(vf_netdev, ndev, NULL);

	if (ret != 0) {

		netdev_err(vf_netdev,

			   "can not set master device %s (err = %d)\n",

drivers/net/ipvlan/ipvlan_main.c

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ int ipvlan_link_new(struct net *src_net, struct net_device *dev, 
	if (err < 0)

		goto remove_ida;



	err = netdev_upper_dev_link(phy_dev, dev);

	err = netdev_upper_dev_link(phy_dev, dev, extack);

	if (err) {

		goto unregister_netdev;

	}

drivers/net/macsec.c

+1 −1
Original line number Diff line number Diff line
@@ -3244,7 +3244,7 @@ static int macsec_newlink(struct net *net, struct net_device *dev, 
				       &macsec_netdev_addr_lock_key,

				       macsec_get_nest_level(dev));



	err = netdev_upper_dev_link(real_dev, dev);

	err = netdev_upper_dev_link(real_dev, dev, extack);

	if (err < 0)

		goto unregister;