diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2017-06-30 13:48:19 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-06-30 13:48:19 +0300 |
| commit | 17d9aa66b08de445645bd0688fc1635bed77a57b (patch) | |
| tree | 640606f92a7636819bc5b03dcb4a7b4958a8fb1f /drivers/net/wireless/intel/iwlwifi/dvm/lib.c | |
| parent | 8a063a27815a759b99ad710402da1ccd1b0987f7 (diff) | |
| parent | ba320dd61ec91bbe98730f3407a486facc174d63 (diff) | |
| download | linux-17d9aa66b08de445645bd0688fc1635bed77a57b.tar.gz linux-17d9aa66b08de445645bd0688fc1635bed77a57b.tar.xz | |
Merge tag 'iwlwifi-next-for-kalle-2017-06-30' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Final set of patches for 4.13
* Some important fixes for 9000 HW;
* FW API changes for the upcoming -30 ucode release;
* A few new PCI IDs for 9000 series;
* Reorganization of common files;
* Some more fixes and improvements here and there
* Initialization and other important fixes for 9000 series;
* Support for version 30 of the FW API for 8000 and 9000 series;
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/dvm/lib.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/dvm/lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/lib.c b/drivers/net/wireless/intel/iwlwifi/dvm/lib.c index 74e52f7c5aa1..2b6ffbc46fa5 100644 --- a/drivers/net/wireless/intel/iwlwifi/dvm/lib.c +++ b/drivers/net/wireless/intel/iwlwifi/dvm/lib.c @@ -1157,7 +1157,7 @@ int iwlagn_suspend(struct iwl_priv *priv, struct cfg80211_wowlan *wowlan) if (ret) goto out; - if (!iwlwifi_mod_params.sw_crypto) { + if (!iwlwifi_mod_params.swcrypto) { /* mark all keys clear */ priv->ucode_key_table = 0; ctx->key_mapping_keys = 0; |