Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 278235
b: refs/heads/master
c: f2dc798
h: refs/heads/master
i:
  278233: a26c869
  278231: 46a56cf
v: v3
  • Loading branch information
Johannes Berg authored and John W. Linville committed Nov 21, 2011
1 parent 961e035 commit d9f520a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1e7aecc26b95efb9d9bdba1ff5c33c99ca34d4ad
refs/heads/master: f2dc7989bf821a0ca78289b32f16078c76c88e7e
6 changes: 3 additions & 3 deletions trunk/net/mac80211/mesh_hwmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit d9f520a

Please sign in to comment.