drop iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch from everywhere

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 (file)
index da9eaff..0000000
--- 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 <sashal@kernel.org>
-Date: Mon, 25 Nov 2019 13:21:58 +0200
-Subject: iwlwifi: mvm: fix NVM check for 3168 devices
-
-From: Luca Coelho <luciano.coelho@intel.com>
-
-[ 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 <stsp@stsp.name>
-Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 9f5823b3abfa0d0365e099af0e484c04858eb6f1..73ef64fdf400b5b5f1d08ae43e71b93878bb2b77 100644 (file)
--- 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 (file)
index c5ab8b4..0000000
--- 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 <sashal@kernel.org>
-Date: Mon, 25 Nov 2019 13:21:58 +0200
-Subject: iwlwifi: mvm: fix NVM check for 3168 devices
-
-From: Luca Coelho <luciano.coelho@intel.com>
-
-[ 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 <stsp@stsp.name>
-Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 09e2106a4661c3b76f49afa6bfb5979173553da3..da0e0032c0225d398829dd835e042e268dbbb8d0 100644 (file)
--- 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 (file)
index afa87d5..0000000
--- 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 <sashal@kernel.org>
-Date: Mon, 25 Nov 2019 13:21:58 +0200
-Subject: iwlwifi: mvm: fix NVM check for 3168 devices
-
-From: Luca Coelho <luciano.coelho@intel.com>
-
-[ 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 <stsp@stsp.name>
-Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 8c962d5196ed85ea30891c5edbdc8dac4f519dd1..22126a534c5d14d9469b9b1735811b12a21e1dbc 100644 (file)
--- 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