diff options
| author | Reinette Chatre <reinette.chatre@intel.com> | 2010-04-16 22:43:40 +0200 |
|---|---|---|
| committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-04-16 22:43:40 +0200 |
| commit | 8715fa28fb4fad62f6004d276ec8e1aa5e664e76 (patch) | |
| tree | 5e07f18c04f497833c6b5f043360f5ef58f1f028 /drivers/net/wireless/iwlwifi/iwl-eeprom.h | |
| parent | wireless: rt2x00: rt2800usb: identify Sitecom devices (diff) | |
| parent | iwlwifi: correct 6000 EEPROM regulatory address (diff) | |
| download | linux-8715fa28fb4fad62f6004d276ec8e1aa5e664e76.tar.xz linux-8715fa28fb4fad62f6004d276ec8e1aa5e664e76.zip | |
Merge branch 'wireless-2.6' into wireless-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-6000.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-eeprom.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-eeprom.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h index cb6d50b78140..ef0e3256eec2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h @@ -203,6 +203,10 @@ struct iwl_eeprom_enhanced_txpwr { #define EEPROM_REG_BAND_52_HT40_CHANNELS ((0x92)\ | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 22 bytes */ +/* 6000 regulatory - indirect access */ +#define EEPROM_6000_REG_BAND_24_HT40_CHANNELS ((0x80)\ + | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 14 bytes */ + /* 6000 and up regulatory tx power - indirect access */ /* max. elements per section */ #define EEPROM_MAX_TXPOWER_SECTION_ELEMENTS (8) |