diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2009-10-02 16:43:56 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-10-07 16:33:50 -0400 |
commit | 722d9b1e1e52be46582fa8b01a082a7f79fb464d (patch) | |
tree | a59601a5be707b77e41e897c22925106e3d81398 /drivers | |
parent | 2facba769d7f9e563cf706de709074a2d20f1bba (diff) |
iwlwifi: fix EEPROM enhance tx power offset
Set the correct EEPROM offset for enhance tx power for 6000 series
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-eeprom.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h index 6b68db7b1b81..80b9e45d9b9c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h | |||
@@ -220,35 +220,35 @@ struct iwl_eeprom_enhanced_txpwr { | |||
220 | * Section 10: 2.4 GHz 40MHz channels: 132, 44 (_above_) | 220 | * Section 10: 2.4 GHz 40MHz channels: 132, 44 (_above_) |
221 | */ | 221 | */ |
222 | /* 2.4 GHz band: CCK */ | 222 | /* 2.4 GHz band: CCK */ |
223 | #define EEPROM_LB_CCK_20_COMMON ((0xAA)\ | 223 | #define EEPROM_LB_CCK_20_COMMON ((0xA8)\ |
224 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 8 bytes */ | 224 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 8 bytes */ |
225 | /* 2.4 GHz band: 20MHz-Legacy, 20MHz-HT, 40MHz-HT */ | 225 | /* 2.4 GHz band: 20MHz-Legacy, 20MHz-HT, 40MHz-HT */ |
226 | #define EEPROM_LB_OFDM_COMMON ((0xB2)\ | 226 | #define EEPROM_LB_OFDM_COMMON ((0xB0)\ |
227 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 24 bytes */ | 227 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 24 bytes */ |
228 | /* 5.2 GHz band: 20MHz-Legacy, 20MHz-HT, 40MHz-HT */ | 228 | /* 5.2 GHz band: 20MHz-Legacy, 20MHz-HT, 40MHz-HT */ |
229 | #define EEPROM_HB_OFDM_COMMON ((0xCA)\ | 229 | #define EEPROM_HB_OFDM_COMMON ((0xC8)\ |
230 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 24 bytes */ | 230 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 24 bytes */ |
231 | /* 2.4GHz band channels: | 231 | /* 2.4GHz band channels: |
232 | * 1Legacy, 1HT, 2Legacy, 2HT, 10Legacy, 10HT, 11Legacy, 11HT */ | 232 | * 1Legacy, 1HT, 2Legacy, 2HT, 10Legacy, 10HT, 11Legacy, 11HT */ |
233 | #define EEPROM_LB_OFDM_20_BAND ((0xE2)\ | 233 | #define EEPROM_LB_OFDM_20_BAND ((0xE0)\ |
234 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 64 bytes */ | 234 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 64 bytes */ |
235 | /* 2.4 GHz band HT40 channels: (1,+1) (2,+1) (6,+1) (7,+1) (9,+1) */ | 235 | /* 2.4 GHz band HT40 channels: (1,+1) (2,+1) (6,+1) (7,+1) (9,+1) */ |
236 | #define EEPROM_LB_OFDM_HT40_BAND ((0x122)\ | 236 | #define EEPROM_LB_OFDM_HT40_BAND ((0x120)\ |
237 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 40 bytes */ | 237 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 40 bytes */ |
238 | /* 5.2GHz band channels: 36Legacy, 36HT, 64Legacy, 64HT, 100Legacy, 100HT */ | 238 | /* 5.2GHz band channels: 36Legacy, 36HT, 64Legacy, 64HT, 100Legacy, 100HT */ |
239 | #define EEPROM_HB_OFDM_20_BAND ((0x14A)\ | 239 | #define EEPROM_HB_OFDM_20_BAND ((0x148)\ |
240 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 48 bytes */ | 240 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 48 bytes */ |
241 | /* 5.2 GHz band HT40 channels: (36,+1) (60,+1) (100,+1) */ | 241 | /* 5.2 GHz band HT40 channels: (36,+1) (60,+1) (100,+1) */ |
242 | #define EEPROM_HB_OFDM_HT40_BAND ((0x17A)\ | 242 | #define EEPROM_HB_OFDM_HT40_BAND ((0x178)\ |
243 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 24 bytes */ | 243 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 24 bytes */ |
244 | /* 2.4 GHz band, channnel 13: Legacy, HT */ | 244 | /* 2.4 GHz band, channnel 13: Legacy, HT */ |
245 | #define EEPROM_LB_OFDM_20_CHANNEL_13 ((0x192)\ | 245 | #define EEPROM_LB_OFDM_20_CHANNEL_13 ((0x190)\ |
246 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 16 bytes */ | 246 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 16 bytes */ |
247 | /* 5.2 GHz band, channnel 140: Legacy, HT */ | 247 | /* 5.2 GHz band, channnel 140: Legacy, HT */ |
248 | #define EEPROM_HB_OFDM_20_CHANNEL_140 ((0x1A2)\ | 248 | #define EEPROM_HB_OFDM_20_CHANNEL_140 ((0x1A0)\ |
249 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 16 bytes */ | 249 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 16 bytes */ |
250 | /* 5.2 GHz band, HT40 channnels (132,+1) (44,+1) */ | 250 | /* 5.2 GHz band, HT40 channnels (132,+1) (44,+1) */ |
251 | #define EEPROM_HB_OFDM_HT40_BAND_1 ((0x1B2)\ | 251 | #define EEPROM_HB_OFDM_HT40_BAND_1 ((0x1B0)\ |
252 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 16 bytes */ | 252 | | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 16 bytes */ |
253 | 253 | ||
254 | 254 | ||