summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mesh_pathtbl.c
diff options
context:
space:
mode:
authorJavier Cardona <javier@cozybit.com>2011-08-09 16:45:06 -0700
committerJohn W. Linville <linville@tuxdriver.com>2011-08-24 13:59:42 -0400
commita6965c44e981214c7483e020106a30a869411231 (patch)
treecac9c21c2bbbced4f557c2445bd71d8b7d4e9eb1 /net/mac80211/mesh_pathtbl.c
parent86d7f9f35dcc686d57465798201e678040916979 (diff)
downloadop-kernel-dev-a6965c44e981214c7483e020106a30a869411231.zip
op-kernel-dev-a6965c44e981214c7483e020106a30a869411231.tar.gz
mac80211: mesh locking fixes
mesh_queue_preq is invoked invoked from both user (work queue) and softirq (timer) context, so the _bh version of spinlock needs to be used. Also, the mpath->state_lock should be softirq safe as well. Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mesh_pathtbl.c')
-rw-r--r--net/mac80211/mesh_pathtbl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index bfd7638..385f9fc 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -654,12 +654,12 @@ int mesh_path_del(u8 *addr, struct ieee80211_sub_if_data *sdata)
mpath = node->mpath;
if (mpath->sdata == sdata &&
memcmp(addr, mpath->dst, ETH_ALEN) == 0) {
- spin_lock(&mpath->state_lock);
+ spin_lock_bh(&mpath->state_lock);
mpath->flags |= MESH_PATH_RESOLVING;
hlist_del_rcu(&node->list);
call_rcu(&node->rcu, mesh_path_node_reclaim);
atomic_dec(&tbl->entries);
- spin_unlock(&mpath->state_lock);
+ spin_unlock_bh(&mpath->state_lock);
goto enddel;
}
}
OpenPOWER on IntegriCloud