diff options
| author | Thomas Pedersen <thomas@cozybit.com> | 2013-03-04 16:06:13 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-06 10:36:13 -0500 |
| commit | d37bb18ae3a3fa7ef239aad533742a8b07eae15f (patch) | |
| tree | e36f11d0356b5ef78b456d80831485f9fff8f579 /include | |
| parent | a6dad6a26e15f2f9269eea41b756c8cf0971b2bc (diff) | |
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')
| -rw-r--r-- | include/uapi/linux/nl80211.h | 6 |
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 { | |||
| 2467 | * @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh | 2467 | * @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh |
| 2468 | * point. | 2468 | * point. |
| 2469 | * | 2469 | * |
| 2470 | * @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically | 2470 | * @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically open |
| 2471 | * open peer links when we detect compatible mesh peers. | 2471 | * peer links when we detect compatible mesh peers. Disabled if |
| 2472 | * @NL80211_MESH_SETUP_USERSPACE_MPM or @NL80211_MESH_SETUP_USERSPACE_AMPE are | ||
| 2473 | * set. | ||
| 2472 | * | 2474 | * |
| 2473 | * @NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES: the number of action frames | 2475 | * @NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES: the number of action frames |
| 2474 | * containing a PREQ that an MP can send to a particular destination (path | 2476 | * containing a PREQ that an MP can send to a particular destination (path |