diff options
| author |   Veaceslav Falico <vfalico@redhat.com> | 2013-04-02 05:15:16 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-04-02 12:05:28 -0400 |
| commit | fcd99434fb5c137274d2e15dd2a6a7455f0f29ff (patch) | |
| tree | 3802defbd9908ea60011f7c1f053eb9cf447d963 /drivers/net/bonding | |
| parent | Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
| download | linux-dev-fcd99434fb5c137274d2e15dd2a6a7455f0f29ff.tar.xz linux-dev-fcd99434fb5c137274d2e15dd2a6a7455f0f29ff.zip | |
bonding: get netdev_rx_handler_unregister out of locks
Now that netdev_rx_handler_unregister contains synchronize_net(), we need
to call it outside of bond->lock, cause it might sleep. Also, remove the
already unneded synchronize_net().
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Acked-by: Eric Dumazet <edumazet@google.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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 6bbd90e1123c..a51241b2e621 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1976,12 +1976,11 @@ static int __bond_release_one(struct net_device *bond_dev, return -EINVAL; } + write_unlock_bh(&bond->lock); /* unregister rx_handler early so bond_handle_frame wouldn't be called * for this slave anymore. */ netdev_rx_handler_unregister(slave_dev); - write_unlock_bh(&bond->lock); - synchronize_net(); write_lock_bh(&bond->lock); if (!all && !bond->params.fail_over_mac) { |