Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae63e808 authored May 27, 2009 by Jiri Pirko Committed by David S. Miller May 29, 2009

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>

parent f22a563b

drivers/net/bonding/bond_main.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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);

drivers/net/bonding/bonding.h

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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))