From 2fd79fd27d724af548d830ebc9ceb61cee5ca3de Mon Sep 17 00:00:00 2001
From: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>
Date: Fri, 14 Sep 2012 14:18:31 +0800
Subject: [PATCH] --- yaml --- r: 328166 b: refs/heads/master c:
 9385d04f2872057a2029901190391fe192b18693 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3b6b9e76e7f4..c7fe4b62e511 100644
--- 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
index 9d7ad366ef09..3ab34d816897 100644
--- 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;
 	}