diff options
author | Mahesh Bandewar <maheshb@google.com> | 2015-02-19 13:13:25 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-02-20 17:43:29 -0500 |
commit | 950ddcb1c13f86a08896b48e2c1f1527263d4130 (patch) | |
tree | 9d7e7f0f6561fcd26e291eb4b9fbf6d7326b3e9c /drivers/net/bonding | |
parent | a50dad355a5314da64586da36804b86fbebb7c2a (diff) |
bonding: simple code refactor
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>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index b979c265fc51..675b082283d6 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -2900,6 +2900,8 @@ static int bond_slave_netdev_event(unsigned long event, | |||
2900 | if (old_duplex != slave->duplex) | 2900 | if (old_duplex != slave->duplex) |
2901 | bond_3ad_adapter_duplex_changed(slave); | 2901 | bond_3ad_adapter_duplex_changed(slave); |
2902 | } | 2902 | } |
2903 | /* Fallthrough */ | ||
2904 | case NETDEV_DOWN: | ||
2903 | /* Refresh slave-array if applicable! | 2905 | /* Refresh slave-array if applicable! |
2904 | * If the setup does not use miimon or arpmon (mode-specific!), | 2906 | * If the setup does not use miimon or arpmon (mode-specific!), |
2905 | * then these events will not cause the slave-array to be | 2907 | * then these events will not cause the slave-array to be |
@@ -2911,10 +2913,6 @@ static int bond_slave_netdev_event(unsigned long event, | |||
2911 | if (bond_mode_uses_xmit_hash(bond)) | 2913 | if (bond_mode_uses_xmit_hash(bond)) |
2912 | bond_update_slave_arr(bond, NULL); | 2914 | bond_update_slave_arr(bond, NULL); |
2913 | break; | 2915 | break; |
2914 | case NETDEV_DOWN: | ||
2915 | if (bond_mode_uses_xmit_hash(bond)) | ||
2916 | bond_update_slave_arr(bond, NULL); | ||
2917 | break; | ||
2918 | case NETDEV_CHANGEMTU: | 2916 | case NETDEV_CHANGEMTU: |
2919 | /* TODO: Should slaves be allowed to | 2917 | /* TODO: Should slaves be allowed to |
2920 | * independently alter their MTU? For | 2918 | * independently alter their MTU? For |