Return-path: Received: from 128-177-27-249.ip.openhosting.com ([128.177.27.249]:34015 "EHLO jmalinen.user.openhosting.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752464AbZAGL1w (ORCPT ); Wed, 7 Jan 2009 06:27:52 -0500 Message-Id: <20090107112638.392903295@atheros.com> (sfid-20090107_122755_786644_4AAA7C61) References: <20090107112346.369581673@atheros.com> Date: Wed, 07 Jan 2009 13:23:51 +0200 From: Jouni Malinen To: "John W. Linville" , Johannes Berg Cc: linux-wireless@vger.kernel.org, Jouni Malinen Subject: [PATCH 05/14] mac80211: 802.11w - WEXT parameter for setting mgmt cipher Sender: linux-wireless-owner@vger.kernel.org List-ID: 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 --- include/linux/wireless.h | 5 ++++- net/mac80211/wext.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) --- wireless-testing.orig/include/linux/wireless.h 2008-12-31 17:33:37.000000000 +0200 +++ wireless-testing/include/linux/wireless.h 2009-01-07 13:07:51.000000000 +0200 @@ -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 --- wireless-testing.orig/net/mac80211/wext.c 2009-01-07 10:39:55.000000000 +0200 +++ wireless-testing/net/mac80211/wext.c 2009-01-07 13:07:51.000000000 +0200 @@ -912,6 +912,7 @@ static int ieee80211_ioctl_siwauth(struc case IW_AUTH_WPA_ENABLED: case IW_AUTH_RX_UNENCRYPTED_EAPOL: case IW_AUTH_KEY_MGMT: + case IW_AUTH_CIPHER_GROUP_MGMT: break; case IW_AUTH_CIPHER_PAIRWISE: if (sdata->vif.type == NL80211_IFTYPE_STATION) { -- -- Jouni Malinen PGP id EFC895FA