diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/bonding/bond_alb.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index 25b8dbf6cfd7..9b55a123c08f 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c | |||
@@ -1601,9 +1601,6 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave | |||
1601 | struct slave *swap_slave; | 1601 | struct slave *swap_slave; |
1602 | int i; | 1602 | int i; |
1603 | 1603 | ||
1604 | if (new_slave) | ||
1605 | ASSERT_RTNL(); | ||
1606 | |||
1607 | if (bond->curr_active_slave == new_slave) { | 1604 | if (bond->curr_active_slave == new_slave) { |
1608 | return; | 1605 | return; |
1609 | } | 1606 | } |
@@ -1649,6 +1646,8 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave | |||
1649 | write_unlock_bh(&bond->curr_slave_lock); | 1646 | write_unlock_bh(&bond->curr_slave_lock); |
1650 | read_unlock(&bond->lock); | 1647 | read_unlock(&bond->lock); |
1651 | 1648 | ||
1649 | ASSERT_RTNL(); | ||
1650 | |||
1652 | /* curr_active_slave must be set before calling alb_swap_mac_addr */ | 1651 | /* curr_active_slave must be set before calling alb_swap_mac_addr */ |
1653 | if (swap_slave) { | 1652 | if (swap_slave) { |
1654 | /* swap mac address */ | 1653 | /* swap mac address */ |