GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-06 06:24:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bonding: use bond_is_lb() when it's appropriate

Browse source 
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>
This commit is contained in:
Jiri Pirko 2009-05-27 05:42:36 +00:00 • committed by David S. Miller
parent f22a563b0a
commit ae63e808f5
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/bonding/bond_main.c
View file

@ -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);

3
drivers/net/bonding/bonding.h
View file

@ -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))