From 26b13f138be0e9dd086f99d5df3fb1b94e773790 Mon Sep 17 00:00:00 2001
From: Thomas Pedersen <thomas@cozybit.com>
Date: Mon, 4 Mar 2013 13:06:13 -0800
Subject: [PATCH] --- yaml --- r: 368443 b: refs/heads/master c:
 d37bb18ae3a3fa7ef239aad533742a8b07eae15f h: refs/heads/master i:   368441:
 8c158ee81477cfdd8e6ccbe3dd55625fde7f0e72   368439:
 712d04d1d230cd453f6f91b4fc8d3333dee583e2 v: v3

---
 [refs]                             | 2 +-
 trunk/include/uapi/linux/nl80211.h | 6 ++++--
 trunk/net/wireless/nl80211.c       | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 14b3a6d90c35..dd46ee36c85b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6dad6a26e15f2f9269eea41b756c8cf0971b2bc
+refs/heads/master: d37bb18ae3a3fa7ef239aad533742a8b07eae15f
diff --git a/trunk/include/uapi/linux/nl80211.h b/trunk/include/uapi/linux/nl80211.h
index 8134c6a96f57..79da8710448e 100644
--- a/trunk/include/uapi/linux/nl80211.h
+++ b/trunk/include/uapi/linux/nl80211.h
@@ -2467,8 +2467,10 @@ enum nl80211_mesh_power_mode {
  * @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh
  *	point.
  *
- * @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically
- *	open peer links when we detect compatible mesh peers.
+ * @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically open
+ *	peer links when we detect compatible mesh peers. Disabled if
+ *	@NL80211_MESH_SETUP_USERSPACE_MPM or @NL80211_MESH_SETUP_USERSPACE_AMPE are
+ *	set.
  *
  * @NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES: the number of action frames
  *	containing a PREQ that an MP can send to a particular destination (path
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index 946b2e7acdf2..f924d45af1b8 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/net/wireless/nl80211.c
@@ -7449,6 +7449,9 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info)
 			return err;
 	}
 
+	if (setup.user_mpm)
+		cfg.auto_open_plinks = false;
+
 	if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
 		err = nl80211_parse_chandef(rdev, info, &setup.chandef);
 		if (err)