| Message ID | 20090527154235.GA17121@psychotron.englab.brq.redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Jiri Pirko <jpirko@redhat.com> wrote: >[PATCH] bonding: use bond_is_lb() when it's appropriate > >Signed-off-by: Jiri Pirko <jpirko@redhat.com> Looks good. Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> >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)) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Jay Vosburgh <fubar@us.ibm.com> Date: Wed, 27 May 2009 09:13:42 -0700 > Jiri Pirko <jpirko@redhat.com> wrote: > >>[PATCH] bonding: use bond_is_lb() when it's appropriate >> >>Signed-off-by: Jiri Pirko <jpirko@redhat.com> > > Looks good. > > Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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))
[PATCH] bonding: use bond_is_lb() when it's appropriate Signed-off-by: Jiri Pirko <jpirko@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html