bonding: remove rtmsg_ifinfo called in bond_master_upper_dev_link (4597efe3) · Commits · 戴 / test

Since commit ("net: add netnotifier event for upper device change"), netdev_master_upper_dev_link has generated NETDEV_CHANGEUPPER event which would send a notification to userspace in rtnetlink_event. There's no need to call rtmsg_ifinfo to send the notification any more. So this patch is to remove it from bond_master_upper_dev_link as well as bond_upper_dev_unlink to avoid the redundant notifications. Signed-off-by:

Xin Long <lucien.xin@gmail.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/bonding/bond_main.c

+3 −8

Original line number	Diff line number	Diff line
		@@ -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,

		return 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;
		}

		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)

Admin message