From 8c53d22b9838d25e8c79b9a18ed71def19c83aef Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 5 Feb 2020 12:56:22 +0000 Subject: [PATCH] drop iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch from everywhere --- ...i-mvm-fix-nvm-check-for-3168-devices.patch | 39 ------------------- queue-4.14/series | 1 - ...i-mvm-fix-nvm-check-for-3168-devices.patch | 39 ------------------- queue-4.19/series | 1 - ...i-mvm-fix-nvm-check-for-3168-devices.patch | 39 ------------------- queue-5.4/series | 1 - 6 files changed, 120 deletions(-) delete mode 100644 queue-4.14/iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch delete mode 100644 queue-4.19/iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch delete mode 100644 queue-5.4/iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch diff --git a/queue-4.14/iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch b/queue-4.14/iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch deleted file mode 100644 index da9eaff67a8..00000000000 --- a/queue-4.14/iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e40beee5d2a725e6016e75b7ccbc1bc823ba7b39 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 25 Nov 2019 13:21:58 +0200 -Subject: iwlwifi: mvm: fix NVM check for 3168 devices - -From: Luca Coelho - -[ Upstream commit b3f20e098293892388d6a0491d6bbb2efb46fbff ] - -We had a check on !NVM_EXT and then a check for NVM_SDP in the else -block of this if. The else block, obviously, could only be reached if -using NVM_EXT, so it would never be NVM_SDP. - -Fix that by checking whether the nvm_type is IWL_NVM instead of -checking for !IWL_NVM_EXT to solve this issue. - -Reported-by: Stefan Sperling -Signed-off-by: Luca Coelho -Signed-off-by: Sasha Levin ---- - drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c -index ca2d66ce84247..8f3032b7174d3 100644 ---- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c -+++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c -@@ -298,7 +298,7 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm) - int regulatory_type; - - /* Checking for required sections */ -- if (mvm->trans->cfg->nvm_type != IWL_NVM_EXT) { -+ if (mvm->trans->cfg->nvm_type == IWL_NVM) { - if (!mvm->nvm_sections[NVM_SECTION_TYPE_SW].data || - !mvm->nvm_sections[mvm->cfg->nvm_hw_section_num].data) { - IWL_ERR(mvm, "Can't parse empty OTP/NVM sections\n"); --- -2.20.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 9f5823b3abf..73ef64fdf40 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -66,7 +66,6 @@ mac80211-fix-tkip-replay-protection-immediately-afte.patch wireless-wext-avoid-gcc-o3-warning.patch net-dsa-bcm_sf2-configure-imp-port-for-2gb-sec.patch bnxt_en-fix-ipv6-rfs-filter-matching-logic.patch -iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch arm-dts-am335x-boneblack-common-fix-memory-size.patch vti-6-fix-packet-tx-through-bpf_redirect.patch scsi-fnic-do-not-queue-commands-during-fwreset.patch diff --git a/queue-4.19/iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch b/queue-4.19/iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch deleted file mode 100644 index c5ab8b4ef37..00000000000 --- a/queue-4.19/iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 48e05aff3d728c9676c793591783b09c4ac9b47a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 25 Nov 2019 13:21:58 +0200 -Subject: iwlwifi: mvm: fix NVM check for 3168 devices - -From: Luca Coelho - -[ Upstream commit b3f20e098293892388d6a0491d6bbb2efb46fbff ] - -We had a check on !NVM_EXT and then a check for NVM_SDP in the else -block of this if. The else block, obviously, could only be reached if -using NVM_EXT, so it would never be NVM_SDP. - -Fix that by checking whether the nvm_type is IWL_NVM instead of -checking for !IWL_NVM_EXT to solve this issue. - -Reported-by: Stefan Sperling -Signed-off-by: Luca Coelho -Signed-off-by: Sasha Levin ---- - drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c -index f2579c94ffdbc..3270faafe0bc3 100644 ---- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c -+++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c -@@ -286,7 +286,7 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm) - int regulatory_type; - - /* Checking for required sections */ -- if (mvm->trans->cfg->nvm_type != IWL_NVM_EXT) { -+ if (mvm->trans->cfg->nvm_type == IWL_NVM) { - if (!mvm->nvm_sections[NVM_SECTION_TYPE_SW].data || - !mvm->nvm_sections[mvm->cfg->nvm_hw_section_num].data) { - IWL_ERR(mvm, "Can't parse empty OTP/NVM sections\n"); --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 09e2106a466..da0e0032c02 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -47,7 +47,6 @@ netfilter-nft_tunnel-erspan_version-must-not-be-null.patch net-dsa-bcm_sf2-configure-imp-port-for-2gb-sec.patch bnxt_en-fix-ipv6-rfs-filter-matching-logic.patch riscv-delete-temporary-files.patch -iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch iwlwifi-don-t-ignore-the-cap-field-upon-mcc-update.patch arm-dts-am335x-boneblack-common-fix-memory-size.patch vti-6-fix-packet-tx-through-bpf_redirect.patch diff --git a/queue-5.4/iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch b/queue-5.4/iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch deleted file mode 100644 index afa87d54cbe..00000000000 --- a/queue-5.4/iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5dfd6137e2fc8da2850d52020bd22fa3460358a8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 25 Nov 2019 13:21:58 +0200 -Subject: iwlwifi: mvm: fix NVM check for 3168 devices - -From: Luca Coelho - -[ Upstream commit b3f20e098293892388d6a0491d6bbb2efb46fbff ] - -We had a check on !NVM_EXT and then a check for NVM_SDP in the else -block of this if. The else block, obviously, could only be reached if -using NVM_EXT, so it would never be NVM_SDP. - -Fix that by checking whether the nvm_type is IWL_NVM instead of -checking for !IWL_NVM_EXT to solve this issue. - -Reported-by: Stefan Sperling -Signed-off-by: Luca Coelho -Signed-off-by: Sasha Levin ---- - drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c -index 945c1ea5cda86..493bcc54a8485 100644 ---- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c -+++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c -@@ -281,7 +281,7 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm) - int regulatory_type; - - /* Checking for required sections */ -- if (mvm->trans->cfg->nvm_type != IWL_NVM_EXT) { -+ if (mvm->trans->cfg->nvm_type == IWL_NVM) { - if (!mvm->nvm_sections[NVM_SECTION_TYPE_SW].data || - !mvm->nvm_sections[mvm->cfg->nvm_hw_section_num].data) { - IWL_ERR(mvm, "Can't parse empty OTP/NVM sections\n"); --- -2.20.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 8c962d5196e..22126a534c5 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -58,7 +58,6 @@ riscv-delete-temporary-files.patch riscv-less-inefficient-gcc-tishift-helpers-and-expor.patch xarray-fix-xas_pause-at-ulong_max.patch iwlwifi-pcie-allocate-smaller-dev_cmd-for-tx-headers.patch -iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch iwlwifi-don-t-ignore-the-cap-field-upon-mcc-update.patch iwlwifi-dbg-force-stop-the-debug-monitor-hw.patch input-evdev-convert-kzalloc-vzalloc-to-kvzalloc.patch -- 2.47.3