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