提交 ae63e808 编写于 作者: J Jiri Pirko 提交者: David S. Miller

bonding: use bond_is_lb() when it's appropriate

Signed-off-by: NJiri Pirko <jpirko@redhat.com>
Signed-off-by: NJay Vosburgh <fubar@us.ibm.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 f22a563b
...@@ -2405,8 +2405,7 @@ static void bond_miimon_commit(struct bonding *bond) ...@@ -2405,8 +2405,7 @@ static void bond_miimon_commit(struct bonding *bond)
bond_3ad_handle_link_change(slave, bond_3ad_handle_link_change(slave,
BOND_LINK_DOWN); BOND_LINK_DOWN);
if (bond->params.mode == BOND_MODE_TLB || if (bond_is_lb(bond))
bond->params.mode == BOND_MODE_ALB)
bond_alb_handle_link_change(bond, slave, bond_alb_handle_link_change(bond, slave,
BOND_LINK_DOWN); BOND_LINK_DOWN);
......
...@@ -286,8 +286,7 @@ static inline unsigned long slave_last_rx(struct bonding *bond, ...@@ -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) static inline void bond_set_slave_inactive_flags(struct slave *slave)
{ {
struct bonding *bond = netdev_priv(slave->dev->master); struct bonding *bond = netdev_priv(slave->dev->master);
if (bond->params.mode != BOND_MODE_TLB && if (!bond_is_lb(bond))
bond->params.mode != BOND_MODE_ALB)
slave->state = BOND_STATE_BACKUP; slave->state = BOND_STATE_BACKUP;
slave->dev->priv_flags |= IFF_SLAVE_INACTIVE; slave->dev->priv_flags |= IFF_SLAVE_INACTIVE;
if (slave_do_arp_validate(bond, slave)) if (slave_do_arp_validate(bond, slave))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册