aboutsummaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorColleen Twitty <colleen@cozybit.com>2013-05-08 14:45:59 -0400
committerJohannes Berg <johannes.berg@intel.com>2013-05-16 16:39:43 -0400
commit6e16d90b5218307db805e6b3e0b06d3946eb8c4c (patch)
treebbd37b170d3657f7df53475f8f9d4d6f73b7260e /include/uapi
parent7ade7036043e2e8e2831ae189ce5c248386062f1 (diff)
cfg80211: Userspace may inform kernel of mesh auth method.
Authentication takes place in userspace, but the beacon is generated in the kernel. Allow userspace to inform the kernel of the authentication method so the appropriate mesh config IE can be set prior to beacon generation when joining the MBSS. Signed-off-by: Colleen Twitty <colleen@cozybit.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/nl80211.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index b48430769eda..06320713e9c9 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -2645,6 +2645,10 @@ enum nl80211_meshconf_params {
2645 * @NL80211_MESH_SETUP_USERSPACE_MPM: Enable this option if userspace will 2645 * @NL80211_MESH_SETUP_USERSPACE_MPM: Enable this option if userspace will
2646 * implement an MPM which handles peer allocation and state. 2646 * implement an MPM which handles peer allocation and state.
2647 * 2647 *
2648 * @NL80211_MESH_SETUP_AUTH_PROTOCOL: Inform the kernel of the authentication
2649 * method (u8, as defined in IEEE 8.4.2.100.6, e.g. 0x1 for SAE).
2650 * Default is no authentication method required.
2651 *
2648 * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number 2652 * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number
2649 * 2653 *
2650 * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use 2654 * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use
@@ -2658,6 +2662,7 @@ enum nl80211_mesh_setup_params {
2658 NL80211_MESH_SETUP_USERSPACE_AMPE, 2662 NL80211_MESH_SETUP_USERSPACE_AMPE,
2659 NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC, 2663 NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC,
2660 NL80211_MESH_SETUP_USERSPACE_MPM, 2664 NL80211_MESH_SETUP_USERSPACE_MPM,
2665 NL80211_MESH_SETUP_AUTH_PROTOCOL,
2661 2666
2662 /* keep last */ 2667 /* keep last */
2663 __NL80211_MESH_SETUP_ATTR_AFTER_LAST, 2668 __NL80211_MESH_SETUP_ATTR_AFTER_LAST,