summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
diff options
context:
space:
mode:
authorAyala Beker2016-04-07 15:21:57 +0200
committerLuca Coelho2016-07-06 01:07:49 +0200
commit2a53d166c464d7b51d6f7204d445fc0254b25f51 (patch)
tree8b717a54a2272473558cf125ce42a415a9fc35f2 /drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
parentiwlwifi: Reserve iwl_fw_error_dump_type enum (diff)
downloadkernel-qcow2-linux-2a53d166c464d7b51d6f7204d445fc0254b25f51.tar.gz
kernel-qcow2-linux-2a53d166c464d7b51d6f7204d445fc0254b25f51.tar.xz
kernel-qcow2-linux-2a53d166c464d7b51d6f7204d445fc0254b25f51.zip
iwlwifi: mvm: add support for GCMP encryption
Newer hardware supports GCMP and GCMP 256-bit ciphers. Add support for adding/setting GCMP key for TX mode. In the TX command handling GCMP-256 is handled in a different way as the key size should be up to 128-bits: Set the key value to the key index in the key table, and specify that this key should be taken form the key table instead of from the TX command. While at it - convert security control flags to an enum. Signed-off-by: Ayala Beker <ayala.beker@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/mvm.h')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/mvm.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 6092af23969f..e240f198e001 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -707,6 +707,7 @@ enum iwl_mvm_queue_status {
};
#define IWL_MVM_DQA_QUEUE_TIMEOUT (5 * HZ)
+#define IWL_MVM_NUM_CIPHERS 8
struct iwl_mvm {
/* for logger access */
@@ -1015,7 +1016,7 @@ struct iwl_mvm {
struct iwl_mvm_shared_mem_cfg shared_mem_cfg;
- u32 ciphers[6];
+ u32 ciphers[IWL_MVM_NUM_CIPHERS];
struct iwl_mvm_tof_data tof_data;
struct ieee80211_vif *nan_vif;