summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-04-04 13:18:44 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-04-04 15:22:13 -0400
commit3d7dc7e8c1566acb0fc55df228b2ed91f5638e9d (patch)
treebe697c2f3904cf24b41274d74831dbfc74792c5d
parent37f4ee0b6b39640828dac5937a482c20e8ac794f (diff)
downloadlinux-3d7dc7e8c1566acb0fc55df228b2ed91f5638e9d.tar.gz
linux-3d7dc7e8c1566acb0fc55df228b2ed91f5638e9d.tar.bz2
linux-3d7dc7e8c1566acb0fc55df228b2ed91f5638e9d.zip
iwlwifi: accept EEPROM version 0x423 for iwl6000
A number of these devices have appeared "in the wild", and apparently the Windows driver is perfectly happy to support this EEPROM version. Signed-off-by: John W. Linville <linville@tuxdriver.com> Cc: stable@kernel.org Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-eeprom.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
index 98aa8af01192..20b66469d68f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
@@ -241,7 +241,7 @@ struct iwl_eeprom_enhanced_txpwr {
/* 6x00 Specific */
#define EEPROM_6000_TX_POWER_VERSION (4)
-#define EEPROM_6000_EEPROM_VERSION (0x434)
+#define EEPROM_6000_EEPROM_VERSION (0x423)
/* 6x50 Specific */
#define EEPROM_6050_TX_POWER_VERSION (4)