diff options
author | Javier Cardona <javier@cozybit.com> | 2011-04-07 18:08:28 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-04-12 16:57:37 -0400 |
commit | 15d5dda623139bbf6165030fc251bbd5798f4130 (patch) | |
tree | 3adb84ef7d65fd274008d950ad99434e1a3a28a7 /include/linux/nl80211.h | |
parent | 581a8b0feeed8877aab3a8ca4c972419790cd07f (diff) |
cfg80211/nl80211: Add userspace authentication flag to mesh setup
During mesh setup, use NL80211_MESH_SETUP_USERSPACE_AUTH flag to create
a secure mesh and route management frames to userspace.
Also, NL80211_CMD_GET_WIPHY now returns a flag NL80211_SUPPORT_MESH_AUTH
if the wiphy's mesh implementation supports routing of mesh auth frames
to userspace. This is useful for forward compatibility between old
kernels and new userspace tools.
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/linux/nl80211.h')
-rw-r--r-- | include/linux/nl80211.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h index ecf6b68a96da..0e652d860819 100644 --- a/include/linux/nl80211.h +++ b/include/linux/nl80211.h | |||
@@ -887,6 +887,9 @@ enum nl80211_commands { | |||
887 | * changed once the mesh is active. | 887 | * changed once the mesh is active. |
888 | * @NL80211_ATTR_MESH_CONFIG: Mesh configuration parameters, a nested attribute | 888 | * @NL80211_ATTR_MESH_CONFIG: Mesh configuration parameters, a nested attribute |
889 | * containing attributes from &enum nl80211_meshconf_params. | 889 | * containing attributes from &enum nl80211_meshconf_params. |
890 | * @NL80211_ATTR_SUPPORT_MESH_AUTH: Currently, this means the underlying driver | ||
891 | * allows auth frames in a mesh to be passed to userspace for processing via | ||
892 | * the @NL80211_MESH_SETUP_USERSPACE_AUTH flag. | ||
890 | * | 893 | * |
891 | * @NL80211_ATTR_MAX: highest attribute number currently defined | 894 | * @NL80211_ATTR_MAX: highest attribute number currently defined |
892 | * @__NL80211_ATTR_AFTER_LAST: internal use | 895 | * @__NL80211_ATTR_AFTER_LAST: internal use |
@@ -1075,6 +1078,8 @@ enum nl80211_attrs { | |||
1075 | NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX, | 1078 | NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX, |
1076 | NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX, | 1079 | NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX, |
1077 | 1080 | ||
1081 | NL80211_ATTR_SUPPORT_MESH_AUTH, | ||
1082 | |||
1078 | /* add attributes here, update the policy in nl80211.c */ | 1083 | /* add attributes here, update the policy in nl80211.c */ |
1079 | 1084 | ||
1080 | __NL80211_ATTR_AFTER_LAST, | 1085 | __NL80211_ATTR_AFTER_LAST, |
@@ -1724,6 +1729,9 @@ enum nl80211_meshconf_params { | |||
1724 | * robust security network ie, or a vendor specific information element that | 1729 | * robust security network ie, or a vendor specific information element that |
1725 | * vendors will use to identify the path selection methods and metrics in use. | 1730 | * vendors will use to identify the path selection methods and metrics in use. |
1726 | * | 1731 | * |
1732 | * @NL80211_MESH_SETUP_USERSPACE_AUTH: Enable this option if an authentication | ||
1733 | * daemon will be authenticating mesh candidates. | ||
1734 | * | ||
1727 | * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number | 1735 | * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number |
1728 | * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use | 1736 | * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use |
1729 | */ | 1737 | */ |
@@ -1732,6 +1740,7 @@ enum nl80211_mesh_setup_params { | |||
1732 | NL80211_MESH_SETUP_ENABLE_VENDOR_PATH_SEL, | 1740 | NL80211_MESH_SETUP_ENABLE_VENDOR_PATH_SEL, |
1733 | NL80211_MESH_SETUP_ENABLE_VENDOR_METRIC, | 1741 | NL80211_MESH_SETUP_ENABLE_VENDOR_METRIC, |
1734 | NL80211_MESH_SETUP_IE, | 1742 | NL80211_MESH_SETUP_IE, |
1743 | NL80211_MESH_SETUP_USERSPACE_AUTH, | ||
1735 | 1744 | ||
1736 | /* keep last */ | 1745 | /* keep last */ |
1737 | __NL80211_MESH_SETUP_ATTR_AFTER_LAST, | 1746 | __NL80211_MESH_SETUP_ATTR_AFTER_LAST, |