aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
-rw-r--r--drivers/net/bonding/bond_main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 815191dd03c3..30b9ea6d62b0 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2795,7 +2795,7 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
2795 */ 2795 */
2796 bond_for_each_slave(bond, slave, i) { 2796 bond_for_each_slave(bond, slave, i) {
2797 if (slave->link != BOND_LINK_UP) { 2797 if (slave->link != BOND_LINK_UP) {
2798 if (time_before_eq(jiffies, slave->dev->trans_start + delta_in_ticks) && 2798 if (time_before_eq(jiffies, dev_trans_start(slave->dev) + delta_in_ticks) &&
2799 time_before_eq(jiffies, slave->dev->last_rx + delta_in_ticks)) { 2799 time_before_eq(jiffies, slave->dev->last_rx + delta_in_ticks)) {
2800 2800
2801 slave->link = BOND_LINK_UP; 2801 slave->link = BOND_LINK_UP;
@@ -2827,7 +2827,7 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
2827 * when the source ip is 0, so don't take the link down 2827 * when the source ip is 0, so don't take the link down
2828 * if we don't know our ip yet 2828 * if we don't know our ip yet
2829 */ 2829 */
2830 if (time_after_eq(jiffies, slave->dev->trans_start + 2*delta_in_ticks) || 2830 if (time_after_eq(jiffies, dev_trans_start(slave->dev) + 2*delta_in_ticks) ||
2831 (time_after_eq(jiffies, slave->dev->last_rx + 2*delta_in_ticks))) { 2831 (time_after_eq(jiffies, slave->dev->last_rx + 2*delta_in_ticks))) {
2832 2832
2833 slave->link = BOND_LINK_DOWN; 2833 slave->link = BOND_LINK_DOWN;
@@ -2938,7 +2938,7 @@ static int bond_ab_arp_inspect(struct bonding *bond, int delta_in_ticks)
2938 * the bond has an IP address) 2938 * the bond has an IP address)
2939 */ 2939 */
2940 if ((slave->state == BOND_STATE_ACTIVE) && 2940 if ((slave->state == BOND_STATE_ACTIVE) &&
2941 (time_after_eq(jiffies, slave->dev->trans_start + 2941 (time_after_eq(jiffies, dev_trans_start(slave->dev) +
2942 2 * delta_in_ticks) || 2942 2 * delta_in_ticks) ||
2943 (time_after_eq(jiffies, slave_last_rx(bond, slave) 2943 (time_after_eq(jiffies, slave_last_rx(bond, slave)
2944 + 2 * delta_in_ticks)))) { 2944 + 2 * delta_in_ticks)))) {
@@ -2982,7 +2982,7 @@ static void bond_ab_arp_commit(struct bonding *bond, int delta_in_ticks)
2982 write_lock_bh(&bond->curr_slave_lock); 2982 write_lock_bh(&bond->curr_slave_lock);
2983 2983
2984 if (!bond->curr_active_slave && 2984 if (!bond->curr_active_slave &&
2985 time_before_eq(jiffies, slave->dev->trans_start + 2985 time_before_eq(jiffies, dev_trans_start(slave->dev) +
2986 delta_in_ticks)) { 2986 delta_in_ticks)) {
2987 slave->link = BOND_LINK_UP; 2987 slave->link = BOND_LINK_UP;
2988 bond_change_active_slave(bond, slave); 2988 bond_change_active_slave(bond, slave);