diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2015-06-19 10:20:10 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-08-13 11:31:32 +0200 |
| commit | 2001a130d4fa8386b9d7978578dc40aa1f0dad6c (patch) | |
| tree | 446c04485a8b181f282083a414a205fe1e81ab7f /drivers/net/wireless/iwlwifi | |
| parent | rfkill: Allow compile test of GPIO consumers if !GPIOLIB (diff) | |
| download | linux-2001a130d4fa8386b9d7978578dc40aa1f0dad6c.tar.xz linux-2001a130d4fa8386b9d7978578dc40aa1f0dad6c.zip | |
iwlwifi: mvm: don't set K1/K2 for AES-CMAC
According to firmware engineers, the firmware has never required
these fields and the values have always been calculated, they were
just leftovers from a previous implementation.
Therefore remove the unnecessary calculation.
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/sta.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h index 21dd5b771660..493a8bdfbc9e 100644 --- a/drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h +++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h @@ -366,8 +366,8 @@ struct iwl_mvm_rm_sta_cmd { * ( MGMT_MCAST_KEY = 0x1f ) * @ctrl_flags: %iwl_sta_key_flag * @IGTK: - * @K1: IGTK master key - * @K2: IGTK sub key + * @K1: unused + * @K2: unused * @sta_id: station ID that support IGTK * @key_id: * @receive_seq_cnt: initial RSC/PN needed for replay check diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.c b/drivers/net/wireless/iwlwifi/mvm/sta.c index d68dc697a4a0..3d2fbf1bc226 100644 --- a/drivers/net/wireless/iwlwifi/mvm/sta.c +++ b/drivers/net/wireless/iwlwifi/mvm/sta.c @@ -1277,8 +1277,6 @@ static int iwl_mvm_send_sta_igtk(struct iwl_mvm *mvm, const u8 *pn; memcpy(igtk_cmd.IGTK, keyconf->key, keyconf->keylen); - ieee80211_aes_cmac_calculate_k1_k2(keyconf, - igtk_cmd.K1, igtk_cmd.K2); ieee80211_get_key_rx_seq(keyconf, 0, &seq); pn = seq.aes_cmac.pn; igtk_cmd.receive_seq_cnt = cpu_to_le64(((u64) pn[5] << 0) | |