diff options
| author | Jiri Pirko <jiri@mellanox.com> | 2015-12-03 12:12:19 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-03 11:49:27 -0500 |
| commit | 5d397061ca2081d8a99e4bee5792122faa6aaf86 (patch) | |
| tree | 01d626dad150aa331d549b6f43460d629ad6ba46 /include/net | |
| parent | 3a0d6c5af5e52622a58c68d7c276db9ec38ee2a4 (diff) | |
| download | linux-5d397061ca2081d8a99e4bee5792122faa6aaf86.tar.gz linux-5d397061ca2081d8a99e4bee5792122faa6aaf86.tar.bz2 linux-5d397061ca2081d8a99e4bee5792122faa6aaf86.zip | |
bonding: allow notifications for bond_set_slave_link_state
Similar to state notifications.
We allow caller to indicate if the notification should happen now or later,
depending on if he holds rtnl mutex or not. Introduce bond_slave_link_notify
function (similar to bond_slave_state_notify) which is later on called
with rtnl mutex and goes over slaves and executes delayed notification.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bonding.h | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/include/net/bonding.h b/include/net/bonding.h index c1740a2794a3..1df437715e2f 100644 --- a/include/net/bonding.h +++ b/include/net/bonding.h @@ -165,7 +165,8 @@ struct slave { u8 backup:1, /* indicates backup slave. Value corresponds with BOND_STATE_ACTIVE and BOND_STATE_BACKUP */ inactive:1, /* indicates inactive slave */ - should_notify:1; /* indicateds whether the state changed */ + should_notify:1, /* indicates whether the state changed */ + should_notify_link:1; /* indicates whether the link changed */ u8 duplex; u32 original_mtu; u32 link_failure_count; @@ -504,10 +505,35 @@ static inline bool bond_is_slave_inactive(struct slave *slave) return slave->inactive; } -static inline void bond_set_slave_link_state(struct slave *slave, int state) +static inline void bond_set_slave_link_state(struct slave *slave, int state, + bool notify) { + if (slave->link == state) + return; + slave->link = state; - bond_queue_slave_event(slave); + if (notify) { + bond_queue_slave_event(slave); + slave->should_notify_link = 0; + } else { + if (slave->should_notify_link) + slave->should_notify_link = 0; + else + slave->should_notify_link = 1; + } +} + +static inline void bond_slave_link_notify(struct bonding *bond) +{ + struct list_head *iter; + struct slave *tmp; + + bond_for_each_slave(bond, tmp, iter) { + if (tmp->should_notify_link) { + bond_queue_slave_event(tmp); + tmp->should_notify_link = 0; + } + } } static inline __be32 bond_confirm_addr(struct net_device *dev, __be32 dst, __be32 local) |