diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-10 19:16:43 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-10 19:16:43 +1000 |
| commit | 50bba07d6a16ce4a3b4f6abb44bfd3645c046ef6 (patch) | |
| tree | c76f080377dd611857fa33f38a2b8a2af4576f8b /drivers/net/wireless/ath/key.c | |
| parent | a8b91e43afd736fcebb0836359e5ddaeae45b2ab (diff) | |
| parent | 50fb31cfed9218b439360caf7c0399b00042da15 (diff) | |
Merge branch 'merge' into next
We want to bring in the latest IRQ fixes
Diffstat (limited to 'drivers/net/wireless/ath/key.c')
| -rw-r--r-- | drivers/net/wireless/ath/key.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/key.c b/drivers/net/wireless/ath/key.c index 0e81904956cf..5c54aa43ca2d 100644 --- a/drivers/net/wireless/ath/key.c +++ b/drivers/net/wireless/ath/key.c @@ -556,6 +556,9 @@ int ath_key_config(struct ath_common *common, return -EIO; set_bit(idx, common->keymap); + if (key->cipher == WLAN_CIPHER_SUITE_CCMP) + set_bit(idx, common->ccmp_keymap); + if (key->cipher == WLAN_CIPHER_SUITE_TKIP) { set_bit(idx + 64, common->keymap); set_bit(idx, common->tkip_keymap); @@ -582,6 +585,7 @@ void ath_key_delete(struct ath_common *common, struct ieee80211_key_conf *key) return; clear_bit(key->hw_key_idx, common->keymap); + clear_bit(key->hw_key_idx, common->ccmp_keymap); if (key->cipher != WLAN_CIPHER_SUITE_TKIP) return; |