From f056e6cf2b9363163758f6ade386d954294b15f0 Mon Sep 17 00:00:00 2001 From: lxoliva Date: Fri, 1 Dec 2017 03:11:24 +0000 Subject: [PATCH 1/1] GNU Linux-libre 4.14.3-gnu: earlier match for new blob in iwlwifi-9000 git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@14470 559672b5-ba27-0410-b829-e8f1faed8b1b --- deblob-check | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/deblob-check b/deblob-check index 4c0a136833e9..7c83fffee0a8 100755 --- a/deblob-check +++ b/deblob-check @@ -4446,7 +4446,7 @@ set_except () { blobname 'pre-cal-%s-%s\.bin' drivers/net/wireless/ath/ath10k/core.c accept '[\t]fw_file->firmware[ ]=[ ]ath10k_fetch_fw_file' drivers/net/wireless/ath/ath10k/core.c blobname 'brcmfmac4356-sdio\.bin' drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c - blobname 'iwlwifi-9000\(-pu-a0-\(jf\|lc\)-[ab]0-\|-\|\)' drivers/net/wireless/intel/iwlwifi/iwl-9000.c + blobname 'iwlwifi-9000\(-pu-[ab]0-\(jf\|lc\)-[ab]0-\|-\|\)' drivers/net/wireless/intel/iwlwifi/iwl-9000.c blobname 'iwlwifi-9260-th-a0-\(jf\|lc\)-a0-' drivers/net/wireless/intel/iwlwifi/iwl-9000.c blobname 'mrvl[/]pcie8897_uapsta_a0\.bin' drivers/net/wireless/marvell/mwifiex/pcie.h blobname 'mrvl[/]pcieuart8997_combo\(_v2\)\?\.bin' drivers/net/wireless/marvell/mwifiex/pcie.h @@ -4917,7 +4917,10 @@ set_except () { accept '[\t]const[ ]char[ ][*]name[ ]=[ ]i915\.vbt_firmware[;][\n][\t]int[ ]ret[;][\n][\n][\t]if[ ][(]!name[ ][|][|][ ][!][*]name[)][\n][\t][\t]return[ ]-ENOENT[;][\n][\n][\t]ret[ ]=[ ]request_firmware[(][&]fw[,][ ]name[,]' drivers/gpu/drm/i915/intel_opregion.c # New in 4.14-rc6. defsnc '[\t]static[ ]const[ ]struct[ ]nphy_txiqcal_ladder[ ]ladder_\(lo\|iq\)\[\][ ]=' drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c - # New in 4.14.3. + # New in 4.14.3. When using python for deblobbing (default), this + # pattern appears too late. An earlier pattern that matches + # iwlwifi-9000 alone and starts with 'iwlwifi-9000\(' needed + # adjusting as well. blobname 'iwlwifi-9000-pu-b0-jf-b0-' drivers/net/wireless/intel/iwlwifi/cfg/9000.c ;; -- 2.31.1