Commit ef5201c8 authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

bonding: remove rtmsg_ifinfo called after bond_lower_state_changed 



After the patch 'rtnetlink: bring NETDEV_CHANGELOWERSTATE event
process back to rtnetlink_event', bond_lower_state_changed would
generate 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 these places after
bond_lower_state_changed.

Besides, after this, rtmsg_ifinfo is not needed to be exported.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eeda3fb9

include/net/bonding.h

+0 −4
Original line number Diff line number Diff line
@@ -330,7 +330,6 @@ static inline void bond_set_active_slave(struct slave *slave) 
		slave->backup = 0;

		bond_queue_slave_event(slave);

		bond_lower_state_changed(slave);

		rtmsg_ifinfo(RTM_NEWLINK, slave->dev, 0, GFP_ATOMIC);

	}

}
@@ -340,7 +339,6 @@ static inline void bond_set_backup_slave(struct slave *slave) 
		slave->backup = 1;

		bond_queue_slave_event(slave);

		bond_lower_state_changed(slave);

		rtmsg_ifinfo(RTM_NEWLINK, slave->dev, 0, GFP_ATOMIC);

	}

}
@@ -353,7 +351,6 @@ static inline void bond_set_slave_state(struct slave *slave, 
	slave->backup = slave_state;

	if (notify) {

		bond_lower_state_changed(slave);

		rtmsg_ifinfo(RTM_NEWLINK, slave->dev, 0, GFP_ATOMIC);

		bond_queue_slave_event(slave);

		slave->should_notify = 0;

	} else {
@@ -385,7 +382,6 @@ static inline void bond_slave_state_notify(struct bonding *bond) 
	bond_for_each_slave(bond, tmp, iter) {

		if (tmp->should_notify) {

			bond_lower_state_changed(tmp);

			rtmsg_ifinfo(RTM_NEWLINK, tmp->dev, 0, GFP_ATOMIC);

			tmp->should_notify = 0;

		}

	}

net/core/rtnetlink.c

+0 −1
Original line number Diff line number Diff line
@@ -2989,7 +2989,6 @@ void rtmsg_ifinfo(int type, struct net_device *dev, unsigned int change, 
{

	rtmsg_ifinfo_event(type, dev, change, rtnl_get_event(0), flags, NULL);

}

EXPORT_SYMBOL(rtmsg_ifinfo);



void rtmsg_ifinfo_newnet(int type, struct net_device *dev, unsigned int change,

			 gfp_t flags, int *new_nsid)

CRA Git | Maintained and supported by SUSTech CRA and CCSE