diff options
author | Javier Cardona <javier@cozybit.com> | 2011-05-03 19:57:07 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-05-11 14:37:47 -0400 |
commit | b130e5cec958bae3867cf6ab09a9b24ba8fada01 (patch) | |
tree | 945eca0ace3d299dfd83de7b7e13c60aa36ba2e9 /net/mac80211/ieee80211_i.h | |
parent | f3a57fd148a4afd3c38f558c5b44972cb29ea8ba (diff) |
nl80211: Introduce NL80211_MESH_SETUP_USERSPACE_AMPE
Introduce a new configuration option to support AMPE from userspace.
Prior to this series we only supported authentication in userspace: an
authentication daemon would authenticate peer candidates in userspace
and hand them over to the kernel. From that point the mesh stack would
take over and establish a peer link (Mesh Peering Management).
These patches introduce support for Authenticated Mesh Peering Exchange
in userspace. The userspace daemon implements the AMPE protocol and on
successfull completion create mesh peers and install encryption keys.
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index e89bc27f8dc3..7f4d0dc1d534 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -490,7 +490,11 @@ struct ieee80211_if_mesh { | |||
490 | bool accepting_plinks; | 490 | bool accepting_plinks; |
491 | const u8 *ie; | 491 | const u8 *ie; |
492 | u8 ie_len; | 492 | u8 ie_len; |
493 | bool is_secure; | 493 | enum { |
494 | IEEE80211_MESH_SEC_NONE = 0x0, | ||
495 | IEEE80211_MESH_SEC_AUTHED = 0x1, | ||
496 | IEEE80211_MESH_SEC_SECURED = 0x2, | ||
497 | } security; | ||
494 | }; | 498 | }; |
495 | 499 | ||
496 | #ifdef CONFIG_MAC80211_MESH | 500 | #ifdef CONFIG_MAC80211_MESH |