|
@@ -2327,32 +2327,32 @@ int bond_3ad_set_carrier(struct bonding *bond)
|
|
|
{
|
|
|
struct aggregator *active;
|
|
|
struct slave *first_slave;
|
|
|
+ int ret = 1;
|
|
|
|
|
|
rcu_read_lock();
|
|
|
first_slave = bond_first_slave_rcu(bond);
|
|
|
- rcu_read_unlock();
|
|
|
- if (!first_slave)
|
|
|
- return 0;
|
|
|
+ if (!first_slave) {
|
|
|
+ ret = 0;
|
|
|
+ goto out;
|
|
|
+ }
|
|
|
active = __get_active_agg(&(SLAVE_AD_INFO(first_slave).aggregator));
|
|
|
if (active) {
|
|
|
/* are enough slaves available to consider link up? */
|
|
|
if (active->num_of_ports < bond->params.min_links) {
|
|
|
if (netif_carrier_ok(bond->dev)) {
|
|
|
netif_carrier_off(bond->dev);
|
|
|
- return 1;
|
|
|
+ goto out;
|
|
|
}
|
|
|
} else if (!netif_carrier_ok(bond->dev)) {
|
|
|
netif_carrier_on(bond->dev);
|
|
|
- return 1;
|
|
|
+ goto out;
|
|
|
}
|
|
|
- return 0;
|
|
|
- }
|
|
|
-
|
|
|
- if (netif_carrier_ok(bond->dev)) {
|
|
|
+ } else if (netif_carrier_ok(bond->dev)) {
|
|
|
netif_carrier_off(bond->dev);
|
|
|
- return 1;
|
|
|
}
|
|
|
- return 0;
|
|
|
+out:
|
|
|
+ rcu_read_unlock();
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
/**
|