diff --git a/srcpkgs/linux5.5/patches/iwlwifi-mvm-3168.diff b/srcpkgs/linux5.5/patches/iwlwifi-mvm-3168.diff deleted file mode 100644 index fcf2736feb..0000000000 --- a/srcpkgs/linux5.5/patches/iwlwifi-mvm-3168.diff +++ /dev/null @@ -1,25 +0,0 @@ -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. - -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; diff --git a/srcpkgs/linux5.5/template b/srcpkgs/linux5.5/template index 6590994d37..c761ebf8e7 100644 --- a/srcpkgs/linux5.5/template +++ b/srcpkgs/linux5.5/template @@ -1,6 +1,6 @@ # Template file for 'linux5.5' pkgname=linux5.5 -version=5.5.9 +version=5.5.10 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Juan RP " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz" -checksum=a435e16950bbe80362495383c2b5e8b78a4b3879c894e2b3c38ecba6fe7ca878 +checksum=e31d8e35d7d9766fa912b8cebcfaaa8fc6dd07413a467641d264fd13cf20fc23 patch_args="-Np1" # XXX restrict archs until all archs are updated.