diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-08 13:22:53 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-08 13:22:53 -0500 |
| commit | b98a7a0790ad44a06f6bd9162043d07bf0c9464f (patch) | |
| tree | a1d23c77f18539203bb1daca4cf59d12dfab683c | |
| parent | af8e256f14d5c335e064befe8e22d773f8612210 (diff) | |
| download | longterm-queue-4.8-b98a7a0790ad44a06f6bd9162043d07bf0c9464f.tar.gz | |
iwlwifi: drop patch n/a for 4.8.x
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/iwlwifi-mvm-don-t-restart-HW-if-suspend-fails-with-u.patch | 43 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 44 deletions
diff --git a/queue/iwlwifi-mvm-don-t-restart-HW-if-suspend-fails-with-u.patch b/queue/iwlwifi-mvm-don-t-restart-HW-if-suspend-fails-with-u.patch deleted file mode 100644 index 4bc8404..0000000 --- a/queue/iwlwifi-mvm-don-t-restart-HW-if-suspend-fails-with-u.patch +++ /dev/null @@ -1,43 +0,0 @@ -From bac453ab3745eaa64137ea6e77e009b45954f0ae Mon Sep 17 00:00:00 2001 -From: Luca Coelho <luciano.coelho@intel.com> -Date: Fri, 7 Oct 2016 15:16:26 +0300 -Subject: [PATCH] iwlwifi: mvm: don't restart HW if suspend fails with unified - image - -commit bac453ab3745eaa64137ea6e77e009b45954f0ae upstream. - -For unified images, we shouldn't restart the HW if suspend fails. The -only reason for restarting the HW with non-unified images is to go -back to the D0 image. - -Fixes: 23ae61282b88 ("iwlwifi: mvm: Do not switch to D3 image on suspend") -Signed-off-by: Luca Coelho <luciano.coelho@intel.com> - -diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c -index b88e2048ae0b..207d8ae1e116 100644 ---- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c -+++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c -@@ -1262,12 +1262,15 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw, - iwl_trans_d3_suspend(mvm->trans, test, !unified_image); - out: - if (ret < 0) { -- iwl_mvm_ref(mvm, IWL_MVM_REF_UCODE_DOWN); -- if (mvm->restart_fw > 0) { -- mvm->restart_fw--; -- ieee80211_restart_hw(mvm->hw); -- } - iwl_mvm_free_nd(mvm); -+ -+ if (!unified_image) { -+ iwl_mvm_ref(mvm, IWL_MVM_REF_UCODE_DOWN); -+ if (mvm->restart_fw > 0) { -+ mvm->restart_fw--; -+ ieee80211_restart_hw(mvm->hw); -+ } -+ } - } - out_noreset: - mutex_unlock(&mvm->mutex); --- -2.12.0 - diff --git a/queue/series b/queue/series index b3ff7c2..6fc4f4b 100644 --- a/queue/series +++ b/queue/series @@ -82,7 +82,6 @@ mwifiex-debugfs-Fix-sometimes-off-by-1-SSID-print.patch mwifiex-remove-redundant-dma-padding-in-AMSDU.patch mwifiex-Avoid-skipping-WEP-key-deletion-for-AP.patch iwlwifi-fix-MODULE_FIRMWARE-for-6030.patch -iwlwifi-mvm-don-t-restart-HW-if-suspend-fails-with-u.patch iwlwifi-mvm-overwrite-skb-info-later.patch iwlwifi-pcie-don-t-increment-decrement-a-bool.patch iwlwifi-pcie-fix-the-set-of-DMA-memory-mask.patch |