Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54604d3a authored by Jouni Malinen's avatar Jouni Malinen Committed by John W. Linville
Browse files

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: default avatarJouni Malinen <j@w1.fi>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3cfcf6ac

include/linux/wireless.h

+4 −1
Original line number Diff line number Diff line
@@ -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

net/mac80211/wext.c

+1 −0
Original line number Diff line number Diff line
@@ -927,6 +927,7 @@ static int ieee80211_ioctl_siwauth(struct net_device *dev, 
	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) {