From: Greg Kroah-Hartman Date: Thu, 14 Jun 2012 22:13:04 +0000 (-0700) Subject: delete broken iwlwifi patch X-Git-Tag: v3.0.35~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4a56a86d87ecca5b43eec6acff8c27ad11ab02b;p=thirdparty%2Fkernel%2Fstable-queue.git delete broken iwlwifi patch --- diff --git a/queue-3.4/iwlwifi-use-correct-supported-firmware-for-6035-and-6000g2.patch b/queue-3.4/iwlwifi-use-correct-supported-firmware-for-6035-and-6000g2.patch deleted file mode 100644 index 085e330290d..00000000000 --- a/queue-3.4/iwlwifi-use-correct-supported-firmware-for-6035-and-6000g2.patch +++ /dev/null @@ -1,82 +0,0 @@ -From d2c8b15d0cb486f4938ba7f2af349d9d1220cb10 Mon Sep 17 00:00:00 2001 -From: Meenakshi Venkataraman -Date: Tue, 5 Jun 2012 20:24:37 +0200 -Subject: iwlwifi: use correct supported firmware for 6035 and 6000g2 - -From: Meenakshi Venkataraman - -commit d2c8b15d0cb486f4938ba7f2af349d9d1220cb10 upstream. - -My patch - - iwlwifi: use correct released ucode version - -did not correctly report supported firmware -for the 6035 device. This patch fixes it. The -minimum supported firmware version for 6035 -is v6. - -Also correct the minimum supported firmware -version for the 6000g2 series of devices. - -Signed-off-by: Meenakshi Venkataraman -Reviewed-by: Emmanuel Grumbach -Signed-off-by: Johannes Berg -Signed-off-by: John W. Linville -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/wireless/iwlwifi/iwl-6000.c | 23 +++++++++++++++++++++-- - 1 file changed, 21 insertions(+), 2 deletions(-) - ---- a/drivers/net/wireless/iwlwifi/iwl-6000.c -+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c -@@ -49,17 +49,20 @@ - #define IWL6000_UCODE_API_MAX 6 - #define IWL6050_UCODE_API_MAX 5 - #define IWL6000G2_UCODE_API_MAX 6 -+#define IWL6035_UCODE_API_MAX 6 - - /* Oldest version we won't warn about */ - #define IWL6000_UCODE_API_OK 4 - #define IWL6000G2_UCODE_API_OK 5 - #define IWL6050_UCODE_API_OK 5 - #define IWL6000G2B_UCODE_API_OK 6 -+#define IWL6035_UCODE_API_OK 6 - - /* Lowest firmware API version supported */ - #define IWL6000_UCODE_API_MIN 4 - #define IWL6050_UCODE_API_MIN 4 --#define IWL6000G2_UCODE_API_MIN 4 -+#define IWL6000G2_UCODE_API_MIN 5 -+#define IWL6035_UCODE_API_MIN 6 - - #define IWL6000_FW_PRE "iwlwifi-6000-" - #define IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE __stringify(api) ".ucode" -@@ -425,9 +428,25 @@ const struct iwl_cfg iwl6030_2bg_cfg = { - IWL_DEVICE_6030, - }; - -+#define IWL_DEVICE_6035 \ -+ .fw_name_pre = IWL6030_FW_PRE, \ -+ .ucode_api_max = IWL6035_UCODE_API_MAX, \ -+ .ucode_api_ok = IWL6035_UCODE_API_OK, \ -+ .ucode_api_min = IWL6035_UCODE_API_MIN, \ -+ .device_family = IWL_DEVICE_FAMILY_6030, \ -+ .max_inst_size = IWL60_RTC_INST_SIZE, \ -+ .max_data_size = IWL60_RTC_DATA_SIZE, \ -+ .eeprom_ver = EEPROM_6030_EEPROM_VERSION, \ -+ .eeprom_calib_ver = EEPROM_6030_TX_POWER_VERSION, \ -+ .base_params = &iwl6000_g2_base_params, \ -+ .bt_params = &iwl6000_bt_params, \ -+ .need_temp_offset_calib = true, \ -+ .led_mode = IWL_LED_RF_STATE, \ -+ .adv_pm = true -+ - const struct iwl_cfg iwl6035_2agn_cfg = { - .name = "Intel(R) Centrino(R) Advanced-N 6235 AGN", -- IWL_DEVICE_6030, -+ IWL_DEVICE_6035, - .ht_params = &iwl6000_ht_params, - }; - diff --git a/queue-3.4/series b/queue-3.4/series index 82c8b66a66c..67f3e186af4 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -15,7 +15,6 @@ drm-ttm-fix-buffer-object-metadata-accounting-regression-v2.patch btrfs-fall-back-to-non-inline-if-we-don-t-have-enough-space.patch iwlwifi-disable-wowlan-if-config_pm_sleep.patch iwlwifi-unregister-leds-if-mac80211-registration-fails.patch -iwlwifi-use-correct-supported-firmware-for-6035-and-6000g2.patch iwlwifi-don-t-mess-up-the-scd-when-removing-a-key.patch iwlwifi-disable-the-buggy-chain-extension-feature-in-hw.patch mac80211-fix-error-in-station-state-transitions-during-reconfig.patch