commit: a91bb69e72b481ae5c68a3faf3e109aa68613ad8 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Wed Feb 5 14:43:24 2020 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Wed Feb 5 14:43:24 2020 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=a91bb69e
iwlwifi: mvm: Do not require PHY_SKU NVM section for 3168 devices See bug#706810 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> 0000_README | 4 ++++ 2400_iwlwifi-PHY_SKU-NVM-3168-fix.patch | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/0000_README b/0000_README index 65e9013..ead5c5e 100644 --- a/0000_README +++ b/0000_README @@ -63,6 +63,10 @@ Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch From: https://lore.kernel.org/linux-bluetooth/[email protected]/raw Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758 +Patch: 2400_iwlwifi-PHY_SKU-NVM-3168-fix.patch +From: https://patchwork.kernel.org/patch/11353871/ +Desc: iwlwifi: mvm: Do not require PHY_SKU NVM section for 3168 devices + Patch: 2600_enable-key-swapping-for-apple-mac.patch From: https://github.com/free5lot/hid-apple-patched Desc: This hid-apple patch enables swapping of the FN and left Control keys and some additional on some apple keyboards. See bug #622902 diff --git a/2400_iwlwifi-PHY_SKU-NVM-3168-fix.patch b/2400_iwlwifi-PHY_SKU-NVM-3168-fix.patch new file mode 100644 index 0000000..d736a9e --- /dev/null +++ b/2400_iwlwifi-PHY_SKU-NVM-3168-fix.patch @@ -0,0 +1,14 @@ +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;
