From 8588b5c18b977884d96ea2d8a2fea309da87a1d0 Mon Sep 17 00:00:00 2001
From: Thomas Pedersen <thomas@cozybit.com>
Date: Mon, 4 Mar 2013 13:06:14 -0800
Subject: [PATCH] --- yaml --- r: 368444 b: refs/heads/master c:
 146bb4839adfd5637beb6daa01aa94f342de5eab h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index dd46ee36c85b..a6be0a80a4d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d37bb18ae3a3fa7ef239aad533742a8b07eae15f
+refs/heads/master: 146bb4839adfd5637beb6daa01aa94f342de5eab
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index c6c7f6e0b585..1d1ddabd89ca 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -1773,8 +1773,11 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,
 		conf->dot11MeshTTL = nconf->dot11MeshTTL;
 	if (_chg_mesh_attr(NL80211_MESHCONF_ELEMENT_TTL, mask))
 		conf->element_ttl = nconf->element_ttl;
-	if (_chg_mesh_attr(NL80211_MESHCONF_AUTO_OPEN_PLINKS, mask))
+	if (_chg_mesh_attr(NL80211_MESHCONF_AUTO_OPEN_PLINKS, mask)) {
+		if (ifmsh->user_mpm)
+			return -EBUSY;
 		conf->auto_open_plinks = nconf->auto_open_plinks;
+	}
 	if (_chg_mesh_attr(NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR, mask))
 		conf->dot11MeshNbrOffsetMaxNeighbor =
 			nconf->dot11MeshNbrOffsetMaxNeighbor;