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/net/bonding/bonding.h | |
| 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/net/bonding/bonding.h')
| -rw-r--r-- | drivers/net/bonding/bonding.h | 3 |
1 files changed, 1 insertions, 2 deletions
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)) |