bonding: Invert test
authorJoe Perches <joe@perches.com>
Tue, 18 Feb 2014 17:42:47 +0000 (09:42 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 19 Feb 2014 20:37:51 +0000 (15:37 -0500)
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>
drivers/net/bonding/bond_3ad.c

index 87348411bafec613c8de2f9b32faaf8608c9f62a..f04f3625e9440804bdb06cd6445cc1eed628d56b 100644 (file)
@@ -2379,17 +2379,16 @@ int __bond_3ad_get_active_agg_info(struct bonding *bond,
                }
        }
 
-       if (aggregator) {
-               ad_info->aggregator_id = aggregator->aggregator_identifier;
-               ad_info->ports = aggregator->num_of_ports;
-               ad_info->actor_key = aggregator->actor_oper_aggregator_key;
-               ad_info->partner_key = aggregator->partner_oper_aggregator_key;
-               ether_addr_copy(ad_info->partner_system,
-                               aggregator->partner_system.mac_addr_value);
-               return 0;
-       }
-
-       return -1;
+       if (!aggregator)
+               return -1;
+
+       ad_info->aggregator_id = aggregator->aggregator_identifier;
+       ad_info->ports = aggregator->num_of_ports;
+       ad_info->actor_key = aggregator->actor_oper_aggregator_key;
+       ad_info->partner_key = aggregator->partner_oper_aggregator_key;
+       ether_addr_copy(ad_info->partner_system,
+                       aggregator->partner_system.mac_addr_value);
+       return 0;
 }
 
 /* Wrapper used to hold bond->lock so no slave manipulation can occur */