diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-29 12:07:37 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-29 12:07:37 -0400 |
| commit | 42fb0b0278e6b9a44bee8adec051de5f43e10b2b (patch) | |
| tree | f53513819d11445385346cf75be05054dae3438d /drivers/net/wireless/ath/key.c | |
| parent | 34202e28fe7fc8551313f9a035a8857db83de757 (diff) | |
| parent | c9015b24b262bc7ea56cfd5d78983a73fb5ebd7d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
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 0e81904956c..5c54aa43ca2 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; |