From: Greg Kroah-Hartman Date: Fri, 1 Jun 2012 07:02:03 +0000 (+0800) Subject: remove redundant iwlwifi patches from 3.3 X-Git-Tag: v3.0.33~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d7e73a0fec7530fdf94383e66f6038a03aeaaa5;p=thirdparty%2Fkernel%2Fstable-queue.git remove redundant iwlwifi patches from 3.3 --- diff --git a/queue-3.3/iwlwifi-use-6000g2b-for-6030-device-series.patch b/queue-3.3/iwlwifi-use-6000g2b-for-6030-device-series.patch deleted file mode 100644 index 434950040bf..00000000000 --- a/queue-3.3/iwlwifi-use-6000g2b-for-6030-device-series.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 35e7adaaf6932c5ffb22c6ec521734434c65adc5 Mon Sep 17 00:00:00 2001 -From: Wey-Yi Guy -Date: Wed, 25 Apr 2012 08:10:08 -0700 -Subject: iwlwifi: use 6000G2B for 6030 device series - -From: Wey-Yi Guy - -commit 35e7adaaf6932c5ffb22c6ec521734434c65adc5 upstream. - -"iwlwifi: use correct released ucode version" change -the ucode api ok from 6000G2 to 6000G2B, but it shall belong -to 6030 device series, not the 6005 device series. Fix it - -Signed-off-by: Wey-Yi Guy -Signed-off-by: John W. Linville -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/wireless/iwlwifi/iwl-6000.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/wireless/iwlwifi/iwl-6000.c -+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c -@@ -391,7 +391,7 @@ struct iwl_cfg iwl6005_2agn_d_cfg = { - #define IWL_DEVICE_6030 \ - .fw_name_pre = IWL6030_FW_PRE, \ - .ucode_api_max = IWL6000G2_UCODE_API_MAX, \ -- .ucode_api_ok = IWL6000G2B_UCODE_API_OK, \ -+ .ucode_api_ok = IWL6000G2_UCODE_API_OK, \ - .ucode_api_min = IWL6000G2_UCODE_API_MIN, \ - .eeprom_ver = EEPROM_6030_EEPROM_VERSION, \ - .eeprom_calib_ver = EEPROM_6030_TX_POWER_VERSION, \ diff --git a/queue-3.3/iwlwifi-use-correct-released-ucode-version.patch b/queue-3.3/iwlwifi-use-correct-released-ucode-version.patch deleted file mode 100644 index eec407d75b9..00000000000 --- a/queue-3.3/iwlwifi-use-correct-released-ucode-version.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e377a4fc768d7d477e58888bdbddd0103d6238bf Mon Sep 17 00:00:00 2001 -From: Meenakshi Venkataraman -Date: Sun, 22 Apr 2012 07:55:27 -0700 -Subject: iwlwifi: use correct released ucode version - -From: Meenakshi Venkataraman - -commit e377a4fc768d7d477e58888bdbddd0103d6238bf upstream. - -Report correctly the latest released version -of the iwlwifi firmware for all -iwlwifi-supported devices. - -Signed-off-by: Meenakshi Venkataraman -Signed-off-by: Wey-Yi Guy -Signed-off-by: John W. Linville -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/wireless/iwlwifi/iwl-6000.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/wireless/iwlwifi/iwl-6000.c -+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c -@@ -351,7 +351,7 @@ static struct iwl_bt_params iwl6000_bt_p - #define IWL_DEVICE_6005 \ - .fw_name_pre = IWL6005_FW_PRE, \ - .ucode_api_max = IWL6000G2_UCODE_API_MAX, \ -- .ucode_api_ok = IWL6000G2_UCODE_API_OK, \ -+ .ucode_api_ok = IWL6000G2B_UCODE_API_OK, \ - .ucode_api_min = IWL6000G2_UCODE_API_MIN, \ - .eeprom_ver = EEPROM_6005_EEPROM_VERSION, \ - .eeprom_calib_ver = EEPROM_6005_TX_POWER_VERSION, \ diff --git a/queue-3.3/series b/queue-3.3/series index 57692a47f8c..59b215fb0e3 100644 --- a/queue-3.3/series +++ b/queue-3.3/series @@ -7,8 +7,6 @@ parisc-fix-crash-in-flush_icache_page_asm-on-pa1.1.patch parisc-fix-panic-on-prefetch-null-on-pa7300lc.patch isdn-gigaset-ratelimit-capi-message-dumps.patch vfs-make-aio-use-the-proper-rw_verify_area-area-helpers.patch -iwlwifi-use-6000g2b-for-6030-device-series.patch -iwlwifi-use-correct-released-ucode-version.patch cfg80211-warn-if-db.txt-is-empty-with-config_cfg80211_internal_regdb.patch regulator-core-release-regulator-regulator-supplies-on-error.patch fix-blocking-allocations-called-very-early-during-bootup.patch