summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-11-18 15:27:31 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-11-21 16:20:48 -0500
commitf2dc7989bf821a0ca78289b32f16078c76c88e7e (patch)
treebb569e62b8845b96c70561e9dbf893f6a126bb79
parent1e7aecc26b95efb9d9bdba1ff5c33c99ca34d4ad (diff)
mac80211: minor cleanup to mesh state locking
First time I tried smatch, and it says: mesh_hwmp.c +870 mesh_queue_preq(21) error: double lock 'bottom_half:' mesh_hwmp.c +873 mesh_queue_preq(24) error: double unlock 'bottom_half:' mesh_hwmp.c +886 mesh_queue_preq(37) error: double unlock 'bottom_half:' Which is indeed true -- there's no point in disabling BHs again if we just did that a few lines earlier, so remove. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/mac80211/mesh_hwmp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 8a81591f001..ce3db2735d7 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/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;