|
@@ -1221,22 +1221,17 @@ 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, extack);
|
|
|
- if (err)
|
|
|
- return err;
|
|
|
- rtmsg_ifinfo(RTM_NEWLINK, slave->dev, IFF_SLAVE, GFP_KERNEL);
|
|
|
- return 0;
|
|
|
+
|
|
|
+ return netdev_master_upper_dev_link(slave->dev, bond->dev, slave,
|
|
|
+ &lag_upper_info, extack);
|
|
|
}
|
|
|
|
|
|
static void bond_upper_dev_unlink(struct bonding *bond, struct slave *slave)
|
|
|
{
|
|
|
netdev_upper_dev_unlink(slave->dev, bond->dev);
|
|
|
slave->dev->flags &= ~IFF_SLAVE;
|
|
|
- rtmsg_ifinfo(RTM_NEWLINK, slave->dev, IFF_SLAVE, GFP_KERNEL);
|
|
|
}
|
|
|
|
|
|
static struct slave *bond_alloc_slave(struct bonding *bond)
|