Thread (3 messages) 3 messages, 2 authors, 2011-08-08

Re: [PATCH] mac80211/mesh: make the preq queue lock consistent

flat view

From: Javier Cardona <hidden>
Date: 2011-08-08 16:26:33

On Mon, Aug 8, 2011 at 1:16 AM, Baruch Siach [off-list ref] wrote:
Hi linux-wireless list,

On Thu, Jul 28, 2011 at 08:51:05AM +0300, Baruch Siach wrote:
quoted
Make mesh_preq_queue_lock locking consistent with mesh_queue_preq() using
spin_lock_bh().
Signed-off-by: Javier Cardona <redacted>

Javier
Ping?

baruch
quoted
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 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 2b18053..fc8cb1a 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);
--
                                                    ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
  - baruch@tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -


-- 
Javier Cardona
cozybit Inc.
http://www.cozybit.com
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help