From 24ab057c43edb04d380740c50d427f493701329b Mon Sep 17 00:00:00 2001
From: Javier Cardona <javier@cozybit.com>
Date: Tue, 9 Aug 2011 16:45:06 -0700
Subject: [PATCH] --- yaml --- r: 265631 b: refs/heads/master c:
 a6965c44e981214c7483e020106a30a869411231 h: refs/heads/master i:   265629:
 38bcc42f825135fa4230a90fa45fe7cee9414e5f   265627:
 e4193074ed66b6208d3a1b22891ee342edfc3e95   265623:
 0caa817995683dbce3b5c69f8592faa2a70d6694   265615:
 f8fe10fcfa0cd2ea8c46bb4f1e5e9e97aa327a62   265599:
 64cc843d7257ee02ca927a644562452a75e43b8e v: v3

---
 [refs]                            | 2 +-
 trunk/net/mac80211/mesh_pathtbl.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d22e80983915..397c3642fd67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86d7f9f35dcc686d57465798201e678040916979
+refs/heads/master: a6965c44e981214c7483e020106a30a869411231
diff --git a/trunk/net/mac80211/mesh_pathtbl.c b/trunk/net/mac80211/mesh_pathtbl.c
index bfd7638e235f..385f9fc526db 100644
--- a/trunk/net/mac80211/mesh_pathtbl.c
+++ b/trunk/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;
 		}
 	}