From 906f37df2eb8ac762ac4bfd435ca2737d71e2bcd Mon Sep 17 00:00:00 2001 From: lxoliva Date: Sun, 28 Apr 2013 17:35:58 +0000 Subject: [PATCH] Recognize ath9k false positives. Don't deblob ath9k/init.c. git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@10332 559672b5-ba27-0410-b829-e8f1faed8b1b --- deblob-3.8 | 7 +------ deblob-check | 10 ++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/deblob-3.8 b/deblob-3.8 index 2139d95a8d4..9f38364b88b 100755 --- a/deblob-3.8 +++ b/deblob-3.8 @@ -48,7 +48,7 @@ # For each kver release, start extra with an empty string, then count # from 1 if changes are needed that require rebuilding the tarball. -kver=3.8 extra= +kver=3.8 extra=0++ case $1 in --force) @@ -1665,11 +1665,6 @@ clean_blob drivers/net/wireless/ath/ath6kl/usb.c clean_kconfig drivers/net/wireless/ath/ath6kl/Kconfig 'ATH6KL_USB' clean_mk CONFIG_ATH6KL_USB drivers/net/wireless/ath/ath6kl/Makefile -announce ATH9K - "Atheros 802.11n wireless cards support" -reject_firmware drivers/net/wireless/ath/ath9k/init.c -clean_kconfig drivers/net/wireless/ath/ath9k/Kconfig 'ATH9K' -clean_mk CONFIG_ATH9K drivers/net/wireless/ath/ath9k/Makefile - announce PRISM2_USB - "Prism2.5/3 USB driver" reject_firmware drivers/staging/wlan-ng/prism2fw.c clean_blob drivers/staging/wlan-ng/prism2fw.c diff --git a/deblob-check b/deblob-check index 0f66d7880f3..cdf9860dd8b 100755 --- a/deblob-check +++ b/deblob-check @@ -3253,6 +3253,16 @@ set_except () { blobname '%s-dsp%d\.\(wmfw\|bin\)' sound/soc/codecs/wm_adsp.c blobname 'fw-4\.bin' drivers/net/wireless/ath/ath6kl/core.h accept '[ ]hdsp->firmware[ ]=[ ]fw' sound/pci/rme9652/hdsp.c + + # ath9k firmware is now Free Software. + accept '[ ]err[ ]=[ ]request_firmware_nowait[(]THIS_MODULE[,][ ]1[,][ ]name[,][ ]sc->dev[,][ ]GFP_KERNEL[,][\n][ ]*[&]ec[,][ ]ath9k_eeprom_request_cb[)][;]' drivers/net/wireless/ath/ath9k/init.c + accept '[#]define[ ]FIRMWARE_AR7010_1_1[ ]*["]htc_7010\.fw["]' drivers/net/wireless/ath/ath9k/hif_usb.c + accept '[#]define[ ]FIRMWARE_AR9271[ ]*["]htc_9271\.fw["]' drivers/net/wireless/ath/ath9k/hif_usb.c + accept 'MODULE_FIRMWARE[(]FIRMWARE_AR7010_1_1[)][;]' drivers/net/wireless/ath/ath9k/hif_usb.c + accept 'MODULE_FIRMWARE[(]FIRMWARE_AR9271[)][;]' drivers/net/wireless/ath/ath9k/hif_usb.c + accept '[ ]ret[ ]=[ ]request_firmware_nowait[(]THIS_MODULE[,][ ]true[,][ ]hif_dev->fw_name[,][\n][ ]*[&]hif_dev->udev->dev[,][ ]GFP_KERNEL[,][\n][ ]*hif_dev[,][ ]ath9k_hif_usb_firmware_cb[)][;]' drivers/net/wireless/ath/ath9k/hif_usb.c + accept '[ ]ret[ ]=[ ]request_firmware[(][&]hif_dev->firmware[,][ ]hif_dev->fw_name[,][\n][ ]*[&]hif_dev->udev->dev[)][;]' drivers/net/wireless/ath/ath9k/hif_usb.c + accept '[ ][ ]ret[ ]=[ ]request_firmware[(][&]fw[,][ ]hif_dev->fw_name[,][\n][ ]*[&]hif_dev->udev->dev[)][;]' drivers/net/wireless/ath/ath9k/hif_usb.c ;; */*freedo*.patch | */*logo*.patch) -- 2.31.1