Re: [PATCH] bonding: use bond_is_lb() when it's appropriate
From: Jay Vosburgh <hidden>
Date: 2009-05-27 16:13:35
Jiri Pirko [off-list ref] wrote:
[PATCH] bonding: use bond_is_lb() when it's appropriate Signed-off-by: Jiri Pirko <redacted>
Looks good. Signed-off-by: Jay Vosburgh <redacted>
quoted hunk ↗ jump to hunk
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 7482402..3ec7d52 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c@@ -2399,8 +2399,7 @@ static void bond_miimon_commit(struct bonding *bond)bond_3ad_handle_link_change(slave, BOND_LINK_DOWN); - if (bond->params.mode == BOND_MODE_TLB || - bond->params.mode == BOND_MODE_ALB) + if (bond_is_lb(bond)) bond_alb_handle_link_change(bond, slave, BOND_LINK_DOWN);diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index ca849d2..41ceca1 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,static inline void bond_set_slave_inactive_flags(struct slave *slave) { struct bonding *bond = netdev_priv(slave->dev->master); - if (bond->params.mode != BOND_MODE_TLB && - bond->params.mode != BOND_MODE_ALB) + if (!bond_is_lb(bond)) slave->state = BOND_STATE_BACKUP; slave->dev->priv_flags |= IFF_SLAVE_INACTIVE; if (slave_do_arp_validate(bond, slave))