summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
diff options
context:
space:
mode:
authorSara Sharon <sara.sharon@intel.com>2017-12-06 13:57:19 +0200
committerLuca Coelho <luciano.coelho@intel.com>2017-12-20 18:28:24 +0200
commit57df383902968a1cc187ea36cefe4b23a58dfdac (patch)
tree844d38bc9d40dab34b7e88533354a7726facf25d /drivers/net/wireless/intel/iwlwifi/mvm/rx.c
parent93b167c13a3afa389eaa1af277e94add976ea43f (diff)
downloadtalos-op-linux-57df383902968a1cc187ea36cefe4b23a58dfdac.tar.gz
talos-op-linux-57df383902968a1cc187ea36cefe4b23a58dfdac.zip
iwlwifi: mvm: support RX flags API change
Latest firmware calculates both phases of the TKIP field, so the TTAK ok flag is not needed and deprecated. Support this API change. Signed-off-by: Sara Sharon <sara.sharon@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/rx.c')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/rx.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
index 63a57f0a16ef..d26833c5ce1f 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
@@ -222,7 +222,9 @@ static u32 iwl_mvm_set_mac80211_rx_flag(struct iwl_mvm *mvm,
case RX_MPDU_RES_STATUS_SEC_TKIP_ENC:
/* Don't drop the frame and decrypt it in SW */
- if (!(rx_pkt_status & RX_MPDU_RES_STATUS_TTAK_OK))
+ if (!fw_has_api(&mvm->fw->ucode_capa,
+ IWL_UCODE_TLV_API_DEPRECATE_TTAK) &&
+ !(rx_pkt_status & RX_MPDU_RES_STATUS_TTAK_OK))
return 0;
*crypt_len = IEEE80211_TKIP_IV_LEN;
/* fall through if TTAK OK */
OpenPOWER on IntegriCloud