---

yaml --- r: 328166 b: refs/heads/master c: 9385d04 h: refs/heads/master v: v3
git-mirror · Sep 14, 2012 · 2fd79fd · 2fd79fd
1 parent fbddb49
commit 2fd79fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d8e4237d2dc73b51ac66dc612c5c42dd7424479
+refs/heads/master: 9385d04f2872057a2029901190391fe192b18693
diff --git a/trunk/net/mac80211/mesh_plink.c b/trunk/net/mac80211/mesh_plink.c
@@ -537,7 +537,8 @@ int mesh_plink_open(struct sta_info *sta)
 	spin_lock_bh(&sta->lock);
 	get_random_bytes(&llid, 2);
 	sta->llid = llid;
-	if (sta->plink_state != NL80211_PLINK_LISTEN) {
+	if (sta->plink_state != NL80211_PLINK_LISTEN &&
+	    sta->plink_state != NL80211_PLINK_BLOCKED) {
 		spin_unlock_bh(&sta->lock);
 		return -EBUSY;
 	}