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

Commit 4703290a authored Dec 08, 2011 by Jouni Malinen Committed by Kalle Valo Dec 13, 2011

ath6kl: Use delayed key configuration for WAPI in AP mode



This is needed to allow WAPI AP to configure the initial group key
to the target in the same way as is done with TKIP/CCMP. This
fixes broadcast data frame delivery with the initial group key.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

parent 5081c80c

drivers/net/wireless/ath/ath6kl/cfg80211.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -999,7 +999,8 @@ static int ath6kl_cfg80211_add_key(struct wiphy wiphy, struct net_device ndev,
		key_usage, key->seq_len);

		if (vif->nw_type == AP_NETWORK && !pairwise &&
		(key_type == TKIP_CRYPT \|\| key_type == AES_CRYPT) && params) {
		(key_type == TKIP_CRYPT \|\| key_type == AES_CRYPT \|\|
		key_type == WAPI_CRYPT) && params) {
		ar->ap_mode_bkey.valid = true;
		ar->ap_mode_bkey.key_index = key_index;
		ar->ap_mode_bkey.key_type = key_type;

drivers/net/wireless/ath/ath6kl/main.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -397,7 +397,9 @@ void ath6kl_connect_ap_mode_bss(struct ath6kl_vif *vif, u16 channel)
		case NONE_AUTH:
		if (vif->prwise_crypto == WEP_CRYPT)
		ath6kl_install_static_wep_keys(vif);
		if (!ik->valid \|\| ik->key_type != WAPI_CRYPT)
		break;
		/* for WAPI, we need to set the delayed group key, continue: */
		case WPA_PSK_AUTH:
		case WPA2_PSK_AUTH:
		case (WPA_PSK_AUTH \| WPA2_PSK_AUTH):