diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2011-12-08 16:50:30 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-12-13 14:21:30 +0200 |
| commit | 4703290af46c73094b5252f0cd643c64613c2cb2 (patch) | |
| tree | 4901aecef83c9e70b6a7744e037c0011e79d8bab /drivers/net/wireless/ath/ath6kl/main.c | |
| parent | 5081c80c7d3fecf59fda79af6648d8c705822b34 (diff) | |
| download | linux-4703290af46c73094b5252f0cd643c64613c2cb2.tar.gz linux-4703290af46c73094b5252f0cd643c64613c2cb2.tar.xz linux-4703290af46c73094b5252f0cd643c64613c2cb2.zip | |
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>
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c index d9b4ba410990..9cf48f449a34 100644 --- a/drivers/net/wireless/ath/ath6kl/main.c +++ b/drivers/net/wireless/ath/ath6kl/main.c @@ -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); - break; + 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): |