Commit e3188a02 authored by Ben Hutchings's avatar Ben Hutchings

iwlwifi: Do not request firmware API version 6 for IWL6005/6205 (Closes: #705655)

svn path=/dists/sid/linux/; revision=19977
parent 7429799b
......@@ -68,6 +68,8 @@ linux (3.2.43-1) UNRELEASED; urgency=low
* [rt] Update to 3.2.42-rt62
* debugfs: Document change of default mode
* fbcon: fix locking harder (Closes: #704933)
* iwlwifi: Do not request firmware API version 6 for IWL6005/6205
(Closes: #705655)
-- Ben Hutchings <ben@decadent.org.uk> Wed, 27 Mar 2013 14:10:40 +0000
......
From: Ben Hutchings <ben@decadent.org.uk>
Subject: iwlwifi: Do not request unreleased firmware for IWL6000
Subject: iwlwifi: Do not request unreleased firmware
Bug-Debian: http://bugs.debian.org/689416
Bug-Debian: http://bugs.debian.org/705655
The iwlwifi driver currently supports firmware API versions 4-6 for
these devices. It will request the file for the latest supported
version and then fall back to earlier versions. However, the latest
version that has actually been released is 4, so we expect the
requests for versions 6 and then 5 to fail.
IWL6000/6300 devices. It will request the file for the latest
supported version and then fall back to earlier versions. However,
the latest version that has actually been released is 4, so we expect
the requests for versions 6 and then 5 to fail.
Similarly for IWL6005/6205 devices it requests API version 6, which is
available but wasn't released until long after this version of the
driver (and after the wheezy freeze).
The installer appears to report any failed request, and it is probably
not easy to detect that this particular failure is harmless. So stop
......@@ -14,12 +19,25 @@ requesting the unreleased firmware.
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -46,7 +46,7 @@
@@ -46,9 +46,10 @@
#include "iwl-cfg.h"
/* Highest firmware API version supported */
-#define IWL6000_UCODE_API_MAX 6
+#define IWL6000_UCODE_API_MAX 4 /* v5-6 are supported but not released */
+#define IWL6000G2_UCODE_API_MAX 5 /* v6 was released too late */
#define IWL6050_UCODE_API_MAX 5
#define IWL6000G2_UCODE_API_MAX 6
-#define IWL6000G2_UCODE_API_MAX 6
+#define IWL6000G2B_UCODE_API_MAX 6
#define IWL6035_UCODE_API_MAX 6
/* Oldest version we won't warn about */
@@ -413,7 +414,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_max = IWL6000G2B_UCODE_API_MAX, \
.ucode_api_ok = IWL6000G2B_UCODE_API_OK, \
.ucode_api_min = IWL6000G2_UCODE_API_MIN, \
.eeprom_ver = EEPROM_6030_EEPROM_VERSION, \
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment