mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
bonding: fix link down handling in 802.3ad mode
One of the purposes of bonding is to allow for redundant links, and failover correctly if the cable is pulled. If all the members of a bonded device have no carrier present, the bonded device itself needs to report no carrier present to user space so management tools (like routing daemons) can respond. Bonding in 802.3ad mode does not work correctly for this because it incorrectly chooses a link that is down as a possible aggregator. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
ffc7a86494
commit
4cd6fe1c64
1 changed files with 8 additions and 3 deletions
|
@ -1465,6 +1465,12 @@ static struct aggregator *ad_agg_selection_test(struct aggregator *best,
|
|||
return best;
|
||||
}
|
||||
|
||||
static int agg_device_up(const struct aggregator *agg)
|
||||
{
|
||||
return (netif_running(agg->slave->dev) &&
|
||||
netif_carrier_ok(agg->slave->dev));
|
||||
}
|
||||
|
||||
/**
|
||||
* ad_agg_selection_logic - select an aggregation group for a team
|
||||
* @aggregator: the aggregator we're looking at
|
||||
|
@ -1496,14 +1502,13 @@ static void ad_agg_selection_logic(struct aggregator *agg)
|
|||
struct port *port;
|
||||
|
||||
origin = agg;
|
||||
|
||||
active = __get_active_agg(agg);
|
||||
best = active;
|
||||
best = (active && agg_device_up(active)) ? active : NULL;
|
||||
|
||||
do {
|
||||
agg->is_active = 0;
|
||||
|
||||
if (agg->num_of_ports)
|
||||
if (agg->num_of_ports && agg_device_up(agg))
|
||||
best = ad_agg_selection_test(best, agg);
|
||||
|
||||
} while ((agg = __get_next_agg(agg)));
|
||||
|
|
Loading…
Reference in a new issue