From d9f520a0b94e5ec2a9f6b89f240fb9cf81822382 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 18 Nov 2011 15:27:31 +0100 Subject: [PATCH] --- yaml --- r: 278235 b: refs/heads/master c: f2dc7989bf821a0ca78289b32f16078c76c88e7e h: refs/heads/master i: 278233: a26c869eadd60eba571d17d4f3d21b766d2186a0 278231: 46a56cfa343fae87a466d0f11ba47ddca202fff0 v: v3 --- [refs] | 2 +- trunk/net/mac80211/mesh_hwmp.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f53882457c54..a3914ca13a15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e7aecc26b95efb9d9bdba1ff5c33c99ca34d4ad +refs/heads/master: f2dc7989bf821a0ca78289b32f16078c76c88e7e diff --git a/trunk/net/mac80211/mesh_hwmp.c b/trunk/net/mac80211/mesh_hwmp.c index 8a81591f0013..ce3db2735d7c 100644 --- a/trunk/net/mac80211/mesh_hwmp.c +++ b/trunk/net/mac80211/mesh_hwmp.c @@ -867,9 +867,9 @@ static void mesh_queue_preq(struct mesh_path *mpath, u8 flags) return; } - spin_lock_bh(&mpath->state_lock); + spin_lock(&mpath->state_lock); if (mpath->flags & MESH_PATH_REQ_QUEUED) { - spin_unlock_bh(&mpath->state_lock); + spin_unlock(&mpath->state_lock); spin_unlock_bh(&ifmsh->mesh_preq_queue_lock); kfree(preq_node); return; @@ -879,7 +879,7 @@ static void mesh_queue_preq(struct mesh_path *mpath, u8 flags) preq_node->flags = flags; mpath->flags |= MESH_PATH_REQ_QUEUED; - spin_unlock_bh(&mpath->state_lock); + spin_unlock(&mpath->state_lock); list_add_tail(&preq_node->list, &ifmsh->preq_queue.list); ++ifmsh->preq_queue_len;