diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-03-18 09:29:54 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-03-18 09:29:54 -0700 |
| commit | ba1e9fbe985cba844afbb3c8500c43e0ff59e4b8 (patch) | |
| tree | 013c37809e2c7fb314893745a75f6b528ec7b417 /0003-iwlwifi-mvm-Do-not-require-PHY_SKU-NVM-section-for-3.patch | |
| parent | Updated to 5.5.9 (diff) | |
| download | linux-ck-ba1e9fbe985cba844afbb3c8500c43e0ff59e4b8.tar.xz | |
Updated to 5.5.10
Diffstat (limited to '0003-iwlwifi-mvm-Do-not-require-PHY_SKU-NVM-section-for-3.patch')
| -rw-r--r-- | 0003-iwlwifi-mvm-Do-not-require-PHY_SKU-NVM-section-for-3.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/0003-iwlwifi-mvm-Do-not-require-PHY_SKU-NVM-section-for-3.patch b/0003-iwlwifi-mvm-Do-not-require-PHY_SKU-NVM-section-for-3.patch deleted file mode 100644 index f9830bb..0000000 --- a/0003-iwlwifi-mvm-Do-not-require-PHY_SKU-NVM-section-for-3.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0e6fb279c7fc6fc818942f668f731946286c959c Mon Sep 17 00:00:00 2001 -From: Dan Moulding <dmoulding@me.com> -Date: Tue, 28 Jan 2020 02:31:07 -0700 -Subject: iwlwifi: mvm: Do not require PHY_SKU NVM section for 3168 devices - -The logic for checking required NVM sections was recently fixed in -commit b3f20e098293 ("iwlwifi: mvm: fix NVM check for 3168 -devices"). However, with that fixed the else is now taken for 3168 -devices and within the else clause there is a mandatory check for the -PHY_SKU section. This causes the parsing to fail for 3168 devices. - -The PHY_SKU section is really only mandatory for the IWL_NVM_EXT -layout (the phy_sku parameter of iwl_parse_nvm_data is only used when -the NVM type is IWL_NVM_EXT). So this changes the PHY_SKU section -check so that it's only mandatory for IWL_NVM_EXT. - -Fixes: b3f20e098293 ("iwlwifi: mvm: fix NVM check for 3168 devices") -Signed-off-by: Dan Moulding <dmoulding@me.com> ---- - drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c -index 46128a2a9c6e..e98ce380c7b9 100644 ---- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c -+++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c -@@ -308,7 +308,8 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm) - } - - /* PHY_SKU section is mandatory in B0 */ -- if (!mvm->nvm_sections[NVM_SECTION_TYPE_PHY_SKU].data) { -+ if (mvm->trans->cfg->nvm_type == IWL_NVM_EXT && -+ !mvm->nvm_sections[NVM_SECTION_TYPE_PHY_SKU].data) { - IWL_ERR(mvm, - "Can't parse phy_sku in B0, empty sections\n"); - return NULL; --- -cgit v1.2.2-1-gc45e - |