diff options
| author | Baruch Siach | 2011-07-28 07:51:05 +0200 |
|---|---|---|
| committer | John W. Linville | 2011-08-08 22:04:18 +0200 |
| commit | 987dafad11bbf0454c88bd3b37461f7f2a423f71 (patch) | |
| tree | 1e55e8c2706a8330c051c0e39365a966ebbe5efc /net/mac80211/mesh_hwmp.c | |
| parent | libertas_usb: program OLPC EC wakeup mask for wake-on-WLAN (diff) | |
| download | kernel-qcow2-linux-987dafad11bbf0454c88bd3b37461f7f2a423f71.tar.gz kernel-qcow2-linux-987dafad11bbf0454c88bd3b37461f7f2a423f71.tar.xz kernel-qcow2-linux-987dafad11bbf0454c88bd3b37461f7f2a423f71.zip | |
mac80211/mesh: make the preq queue lock consistent
Make mesh_preq_queue_lock locking consistent with mesh_queue_preq() using
spin_lock_bh().
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mesh_hwmp.c')
| -rw-r--r-- | net/mac80211/mesh_hwmp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c index 3460108810d5..8404fa5153c6 100644 --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c @@ -792,9 +792,9 @@ static void mesh_queue_preq(struct mesh_path *mpath, u8 flags) return; } - spin_lock(&ifmsh->mesh_preq_queue_lock); + spin_lock_bh(&ifmsh->mesh_preq_queue_lock); if (ifmsh->preq_queue_len == MAX_PREQ_QUEUE_LEN) { - spin_unlock(&ifmsh->mesh_preq_queue_lock); + spin_unlock_bh(&ifmsh->mesh_preq_queue_lock); kfree(preq_node); if (printk_ratelimit()) mhwmp_dbg("PREQ node queue full\n"); @@ -806,7 +806,7 @@ static void mesh_queue_preq(struct mesh_path *mpath, u8 flags) list_add_tail(&preq_node->list, &ifmsh->preq_queue.list); ++ifmsh->preq_queue_len; - spin_unlock(&ifmsh->mesh_preq_queue_lock); + spin_unlock_bh(&ifmsh->mesh_preq_queue_lock); if (time_after(jiffies, ifmsh->last_preq + min_preq_int_jiff(sdata))) ieee80211_queue_work(&sdata->local->hw, &sdata->work); |