]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
bonding: simple code refactor
authorMahesh Bandewar <maheshb@google.com>
Thu, 19 Feb 2015 18:13:25 +0000 (10:13 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 20 Feb 2015 22:43:29 +0000 (17:43 -0500)
Remove duplicate code.

Signed-off-by: Mahesh Bandewar <maheshb@google.com>
Signed-off-by: Andy Gospodarek <gospo@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_main.c

index b979c265fc51d0a09c48ff4216a8b055ebcd1c26..675b082283d64bb7bd6d962516317ac0a565aa82 100644 (file)
@@ -2900,6 +2900,8 @@ static int bond_slave_netdev_event(unsigned long event,
                        if (old_duplex != slave->duplex)
                                bond_3ad_adapter_duplex_changed(slave);
                }
+               /* Fallthrough */
+       case NETDEV_DOWN:
                /* Refresh slave-array if applicable!
                 * If the setup does not use miimon or arpmon (mode-specific!),
                 * then these events will not cause the slave-array to be
@@ -2911,10 +2913,6 @@ static int bond_slave_netdev_event(unsigned long event,
                if (bond_mode_uses_xmit_hash(bond))
                        bond_update_slave_arr(bond, NULL);
                break;
-       case NETDEV_DOWN:
-               if (bond_mode_uses_xmit_hash(bond))
-                       bond_update_slave_arr(bond, NULL);
-               break;
        case NETDEV_CHANGEMTU:
                /* TODO: Should slaves be allowed to
                 * independently alter their MTU?  For