iwlwifi: mvm: change TX_CMD_SEC_KEY_FROM_TABLE value

Change the value of TX_CMD_SEC_KEY_FROM_TABLE flag
in TX_CMD security flags to accommodate a FW API change.

Bump min API for 9000 series devices to 30 to keep the driver aligned
aligned the FW.

Signed-off-by: David Spinadel <david.spinadel@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-9000.c b/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
index d265b279b2caf329c517ea2912371ef66cc15abc..110ceefccc15387e0fa068a46fedf69ab6ab9a14 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
@@ -58,7 +58,7 @@
 #define IWL9000_UCODE_API_MAX  30
 
 /* Lowest firmware API version supported */
-#define IWL9000_UCODE_API_MIN  17
+#define IWL9000_UCODE_API_MIN  30
 
 /* NVM versions */
 #define IWL9000_NVM_VERSION            0x0a1d

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h
index e9f055706a6fd22702887807c260e6fd130d0524..81b98915b1a42e21a318d293c459015688489c7f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h
@@ -174,7 +174,7 @@ enum iwl_tx_cmd_sec_ctrl {
        TX_CMD_SEC_EXT                  = 0x04,
        TX_CMD_SEC_GCMP                 = 0x05,
        TX_CMD_SEC_KEY128               = 0x08,
-       TX_CMD_SEC_KEY_FROM_TABLE       = 0x08,
+       TX_CMD_SEC_KEY_FROM_TABLE       = 0x10,
 };
 
 /* TODO: how does these values are OK with only 16 bit variable??? */