commit: e2008c5b7f70e3fa73c2911aceab812431d7b058 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Mon Mar 30 11:32:57 2020 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Mon Mar 30 11:32:57 2020 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=e2008c5b
Remove incompatible patch 2400_iwlwifi-PHY_SKU-NVM-3168-fix.patch 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 deletions(-) diff --git a/0000_README b/0000_README index 4bc51da..fd3ee5e 100644 --- a/0000_README +++ b/0000_README @@ -55,10 +55,6 @@ Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch From: https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-mar...@holtmann.org/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 deleted file mode 100644 index d736a9e..0000000 --- a/2400_iwlwifi-PHY_SKU-NVM-3168-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -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;
