summaryrefslogtreecommitdiffstats
path: root/include/linux/wireless.h
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2009-01-08 13:32:03 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 16:00:03 -0500
commit54604d3a827b37525ef017adba313c7112e0f484 (patch)
tree2e807a4840fd75edd8d5914628810a4e9ad1ce65 /include/linux/wireless.h
parent3cfcf6ac6d69dc290e96416731eea5c88ac7d426 (diff)
downloadkernel-crypto-54604d3a827b37525ef017adba313c7112e0f484.tar.gz
kernel-crypto-54604d3a827b37525ef017adba313c7112e0f484.tar.xz
kernel-crypto-54604d3a827b37525ef017adba313c7112e0f484.zip
mac80211: 802.11w - WEXT parameter for setting mgmt cipher
Add a new IW_AUTH parameter for setting cipher suite for multicast/broadcast management frames. This is for full-mac drivers that take care of RSN IE generation for (re)association request frames. Signed-off-by: Jouni Malinen <j@w1.fi> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/linux/wireless.h')
-rw-r--r--include/linux/wireless.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/wireless.h b/include/linux/wireless.h
index d7958f9b52c..d426dce47e7 100644
--- a/include/linux/wireless.h
+++ b/include/linux/wireless.h
@@ -577,18 +577,21 @@
#define IW_AUTH_RX_UNENCRYPTED_EAPOL 8
#define IW_AUTH_ROAMING_CONTROL 9
#define IW_AUTH_PRIVACY_INVOKED 10
+#define IW_AUTH_CIPHER_GROUP_MGMT 11
/* IW_AUTH_WPA_VERSION values (bit field) */
#define IW_AUTH_WPA_VERSION_DISABLED 0x00000001
#define IW_AUTH_WPA_VERSION_WPA 0x00000002
#define IW_AUTH_WPA_VERSION_WPA2 0x00000004
-/* IW_AUTH_PAIRWISE_CIPHER and IW_AUTH_GROUP_CIPHER values (bit field) */
+/* IW_AUTH_PAIRWISE_CIPHER, IW_AUTH_GROUP_CIPHER, and IW_AUTH_CIPHER_GROUP_MGMT
+ * values (bit field) */
#define IW_AUTH_CIPHER_NONE 0x00000001
#define IW_AUTH_CIPHER_WEP40 0x00000002
#define IW_AUTH_CIPHER_TKIP 0x00000004
#define IW_AUTH_CIPHER_CCMP 0x00000008
#define IW_AUTH_CIPHER_WEP104 0x00000010
+#define IW_AUTH_CIPHER_AES_CMAC 0x00000020
/* IW_AUTH_KEY_MGMT values (bit field) */
#define IW_AUTH_KEY_MGMT_802_1X 1