diff options
| author | Veaceslav Falico <vfalico@redhat.com> | 2013-04-02 01:15:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-02 12:05:28 -0400 |
| commit | fcd99434fb5c137274d2e15dd2a6a7455f0f29ff (patch) | |
| tree | 3802defbd9908ea60011f7c1f053eb9cf447d963 | |
| parent | 118c9a45fdacc6fe57910fa1d048e2d5bbc193f4 (diff) | |
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>
| -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, | |||
| 1976 | return -EINVAL; | 1976 | return -EINVAL; |
| 1977 | } | 1977 | } |
| 1978 | 1978 | ||
| 1979 | write_unlock_bh(&bond->lock); | ||
| 1979 | /* unregister rx_handler early so bond_handle_frame wouldn't be called | 1980 | /* unregister rx_handler early so bond_handle_frame wouldn't be called |
| 1980 | * for this slave anymore. | 1981 | * for this slave anymore. |
| 1981 | */ | 1982 | */ |
| 1982 | netdev_rx_handler_unregister(slave_dev); | 1983 | netdev_rx_handler_unregister(slave_dev); |
| 1983 | write_unlock_bh(&bond->lock); | ||
| 1984 | synchronize_net(); | ||
| 1985 | write_lock_bh(&bond->lock); | 1984 | write_lock_bh(&bond->lock); |
| 1986 | 1985 | ||
| 1987 | if (!all && !bond->params.fail_over_mac) { | 1986 | if (!all && !bond->params.fail_over_mac) { |
