bonding: bond_change_active_slave() cleanup under active-backup

simplified the code of bond_change_active_slave() such that under
active-backup mode there's one "if (new_active)" test and the rest
of the code only does extra checks on top of it. This removed an
unneeded "if (bond->send_grat_arp > 0)" check and avoid calling
bond_send_gratuitous_arp when there's no active slave.

Jay Vosburgh made minor coding style changes to the orignal patch.

Signed-off-by: Or Gerlitz <ogerlitz@voltaire.com>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 8 insertions, 10 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 5b4af3cc2a4..2db2d057ccd 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1189,21 +1189,19 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
 
                 if (new_active) {
                         bond_set_slave_active_flags(new_active);
-                }
 
-                if (new_active && bond->params.fail_over_mac)
-                        bond_do_fail_over_mac(bond, new_active, old_active);
+                        if (bond->params.fail_over_mac)
+                                bond_do_fail_over_mac(bond, new_active,
+                                                      old_active);
 
-                bond->send_grat_arp = bond->params.num_grat_arp;
-                if (bond->curr_active_slave &&
-                        test_bit(__LINK_STATE_LINKWATCH_PENDING,
+                        bond->send_grat_arp = bond->params.num_grat_arp;
+                        if (!test_bit(__LINK_STATE_LINKWATCH_PENDING,
                                         &bond->curr_active_slave->dev->state)) {
-                        dprintk("delaying gratuitous arp on %s\n",
-                                bond->curr_active_slave->dev->name);
-                } else {
-                        if (bond->send_grat_arp > 0) {
                                 bond_send_gratuitous_arp(bond);
                                 bond->send_grat_arp--;
+                        } else {
+                                dprintk("delaying gratuitous arp on %s\n",
+                                        bond->curr_active_slave->dev->name);
                         }
                 }
         }