diff options
| author | David S. Miller <davem@davemloft.net> | 2013-10-28 00:11:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-28 00:11:22 -0400 |
| commit | 1f2cd845d3827412e82bf26dde0abca332ede402 (patch) | |
| tree | 370a0880f1fb5381925f8f602b2ba99f3904856f /drivers/net/bonding/bond_3ad.c | |
| parent | 6384a4d0dcf9e28f5aa5e0c8a7e58e7b4df19e68 (diff) | |
| download | linux-1f2cd845d3827412e82bf26dde0abca332ede402.tar.gz | |
Revert "Merge branch 'bonding_monitor_locking'"
This reverts commit 4d961a101e032b4bf223b279b4b35bc77576f5a8, reversing changes made to a00f6fcc7d0c62a91768d9c4ccba4c7d64fbbce3. Revert bond locking changes, they cause regressions and Veaceslav Falico doesn't like how the commit messages were done at all. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_3ad.c')
| -rw-r--r-- | drivers/net/bonding/bond_3ad.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index d6fe00bf4858..187b1b7772ef 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c @@ -2068,10 +2068,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work) struct slave *slave; struct port *port; - if (!rtnl_trylock()) { - queue_delayed_work(bond->wq, &bond->ad_work, ad_delta_in_ticks); - return; - } + read_lock(&bond->lock); + //check if there are any slaves if (!bond_has_slaves(bond)) goto re_arm; @@ -2124,8 +2122,9 @@ void bond_3ad_state_machine_handler(struct work_struct *work) } re_arm: - rtnl_unlock(); queue_delayed_work(bond->wq, &bond->ad_work, ad_delta_in_ticks); + + read_unlock(&bond->lock); } /** |