Commit 9385d04f authored Sep 14, 2012 by Chun-Yeow Yeoh Committed by Johannes Berg Sep 14, 2012

mac80211: allow re-open the blocked peer link in mesh



Peer link which is blocked using the "iw mesh0 station
set <MAC addr> plink_action block" is previously not able
to re-open using "iw mesh0 station set <MAC addr>
plink_action open". This patch is intended to solve this.

If the station plink state remains at OPN_SNT once open,
try block and open again should solve this problem.

Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 5d8e4237

net/mac80211/mesh_plink.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}