diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-05-22 15:18:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-05-22 15:18:06 -0400 |
| commit | a0d0d1685f9763ab26a394df3ab84026b39a06a7 (patch) | |
| tree | 4165dc6fd3266977ab4b3fa3b379c47597f97d88 /drivers/net/wireless/iwlwifi/iwl-commands.h | |
| parent | 31a67102f4762df5544bc2dfb34a931233d2a5b2 (diff) | |
| parent | 05f8f25276ea8c7d41b3649890d6eaf179e67a81 (diff) | |
| download | linux-a0d0d1685f9763ab26a394df3ab84026b39a06a7.tar.gz linux-a0d0d1685f9763ab26a394df3ab84026b39a06a7.tar.bz2 linux-a0d0d1685f9763ab26a394df3ab84026b39a06a7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-commands.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-commands.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h index 83a6930f3658..9af6a239b384 100644 --- a/drivers/net/wireless/iwlwifi/iwl-commands.h +++ b/drivers/net/wireless/iwlwifi/iwl-commands.h @@ -1910,6 +1910,8 @@ enum iwl_bt_kill_idx { IWLAGN_BT_VALID_REDUCED_TX_PWR | \ IWLAGN_BT_VALID_3W_LUT) +#define IWLAGN_BT_REDUCED_TX_PWR BIT(0) + #define IWLAGN_BT_DECISION_LUT_SIZE 12 struct iwl_basic_bt_cmd { @@ -1923,6 +1925,10 @@ struct iwl_basic_bt_cmd { u8 bt3_timer_t2_value; __le16 bt4_reaction_time; /* unused */ __le32 bt3_lookup_table[IWLAGN_BT_DECISION_LUT_SIZE]; + /* + * bit 0: use reduced tx power for control frame + * bit 1 - 7: reserved + */ u8 reduce_txpower; u8 reserved; __le16 valid; @@ -2272,7 +2278,6 @@ struct iwl_ssid_ie { #define IWL_GOOD_CRC_TH_DISABLED 0 #define IWL_GOOD_CRC_TH_DEFAULT cpu_to_le16(1) #define IWL_GOOD_CRC_TH_NEVER cpu_to_le16(0xffff) -#define IWL_MAX_SCAN_SIZE 1024 #define IWL_MAX_CMD_SIZE 4096 /* |