diff options
author | Jiri Pirko <jpirko@redhat.com> | 2009-05-27 01:42:36 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-30 01:08:31 -0400 |
commit | ae63e808f508c38fe65e23a1480c85d5bd00ecbd (patch) | |
tree | 6d99401d326d13c648b23932e91e8daaa3344430 /drivers | |
parent | f22a563b0a4c2a84b6ff8831306532b64c9c1747 (diff) |
bonding: use bond_is_lb() when it's appropriate
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 3 | ||||
-rw-r--r-- | drivers/net/bonding/bonding.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 92a9d69c5650..2f4329e91a4c 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -2405,8 +2405,7 @@ static void bond_miimon_commit(struct bonding *bond) | |||
2405 | bond_3ad_handle_link_change(slave, | 2405 | bond_3ad_handle_link_change(slave, |
2406 | BOND_LINK_DOWN); | 2406 | BOND_LINK_DOWN); |
2407 | 2407 | ||
2408 | if (bond->params.mode == BOND_MODE_TLB || | 2408 | if (bond_is_lb(bond)) |
2409 | bond->params.mode == BOND_MODE_ALB) | ||
2410 | bond_alb_handle_link_change(bond, slave, | 2409 | bond_alb_handle_link_change(bond, slave, |
2411 | BOND_LINK_DOWN); | 2410 | BOND_LINK_DOWN); |
2412 | 2411 | ||
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index ca849d2adf98..41ceca12c68f 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h | |||
@@ -286,8 +286,7 @@ static inline unsigned long slave_last_rx(struct bonding *bond, | |||
286 | static inline void bond_set_slave_inactive_flags(struct slave *slave) | 286 | static inline void bond_set_slave_inactive_flags(struct slave *slave) |
287 | { | 287 | { |
288 | struct bonding *bond = netdev_priv(slave->dev->master); | 288 | struct bonding *bond = netdev_priv(slave->dev->master); |
289 | if (bond->params.mode != BOND_MODE_TLB && | 289 | if (!bond_is_lb(bond)) |
290 | bond->params.mode != BOND_MODE_ALB) | ||
291 | slave->state = BOND_STATE_BACKUP; | 290 | slave->state = BOND_STATE_BACKUP; |
292 | slave->dev->priv_flags |= IFF_SLAVE_INACTIVE; | 291 | slave->dev->priv_flags |= IFF_SLAVE_INACTIVE; |
293 | if (slave_do_arp_validate(bond, slave)) | 292 | if (slave_do_arp_validate(bond, slave)) |