diff options
author | Joe Perches <joe@perches.com> | 2014-02-18 12:42:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-02-19 15:37:51 -0500 |
commit | 21f374c6cfbf98c1efceee0b528ce784d215935c (patch) | |
tree | 0a126201a245ccc65938006ea8c35ac778b1c7b6 /drivers/net/bonding | |
parent | 157550fbbbf932970b231394b1069f50104824c5 (diff) |
bonding: Invert test
Make the error case return early.
Make the normal return at the bottom of the function.
Reduces indent for readability.
Signed-off-by: Joe Perches <joe@perches.com>
Reviewed-by: Ding Tianhong <dingtianhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r-- | drivers/net/bonding/bond_3ad.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index 87348411bafe..f04f3625e944 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c | |||
@@ -2379,17 +2379,16 @@ int __bond_3ad_get_active_agg_info(struct bonding *bond, | |||
2379 | } | 2379 | } |
2380 | } | 2380 | } |
2381 | 2381 | ||
2382 | if (aggregator) { | 2382 | if (!aggregator) |
2383 | ad_info->aggregator_id = aggregator->aggregator_identifier; | 2383 | return -1; |
2384 | ad_info->ports = aggregator->num_of_ports; | 2384 | |
2385 | ad_info->actor_key = aggregator->actor_oper_aggregator_key; | 2385 | ad_info->aggregator_id = aggregator->aggregator_identifier; |
2386 | ad_info->partner_key = aggregator->partner_oper_aggregator_key; | 2386 | ad_info->ports = aggregator->num_of_ports; |
2387 | ether_addr_copy(ad_info->partner_system, | 2387 | ad_info->actor_key = aggregator->actor_oper_aggregator_key; |
2388 | aggregator->partner_system.mac_addr_value); | 2388 | ad_info->partner_key = aggregator->partner_oper_aggregator_key; |
2389 | return 0; | 2389 | ether_addr_copy(ad_info->partner_system, |
2390 | } | 2390 | aggregator->partner_system.mac_addr_value); |
2391 | 2391 | return 0; | |
2392 | return -1; | ||
2393 | } | 2392 | } |
2394 | 2393 | ||
2395 | /* Wrapper used to hold bond->lock so no slave manipulation can occur */ | 2394 | /* Wrapper used to hold bond->lock so no slave manipulation can occur */ |