summaryrefslogtreecommitdiffstats
path: root/include/uapi/linux/nl80211.h
diff options
context:
space:
mode:
authorThomas Pedersen <thomas@cozybit.com>2013-03-04 13:06:13 -0800
committerJohannes Berg <johannes.berg@intel.com>2013-03-06 16:36:13 +0100
commitd37bb18ae3a3fa7ef239aad533742a8b07eae15f (patch)
treee36f11d0356b5ef78b456d80831485f9fff8f579 /include/uapi/linux/nl80211.h
parenta6dad6a26e15f2f9269eea41b756c8cf0971b2bc (diff)
downloadtalos-op-linux-d37bb18ae3a3fa7ef239aad533742a8b07eae15f.tar.gz
talos-op-linux-d37bb18ae3a3fa7ef239aad533742a8b07eae15f.zip
nl80211: user_mpm overrides auto_open_plinks
If the user requested a userspace MPM, automatically disable auto_open_plinks to fully disable the kernel MPM. Signed-off-by: Thomas Pedersen <thomas@cozybit.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/uapi/linux/nl80211.h')
-rw-r--r--include/uapi/linux/nl80211.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 8134c6a96f57..79da8710448e 100644
--- a/include/uapi/linux/nl80211.h
+++ b/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
OpenPOWER on IntegriCloud