diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-07-13 15:57:29 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-13 15:57:29 -0400 |
| commit | e300d955debdadf599c36e47eb0bc16f5976215c (patch) | |
| tree | 8fafcc789dc06e90665e6eee6388af228bbd2fd7 /drivers/net/wireless/iwlwifi/iwl-dev.h | |
| parent | 242647bcf8464860f173f3d4d4ab3490d3558518 (diff) | |
| parent | 815868e7b5c207ba42d5b317ccc51f8112732268 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/wl12xx/wl1271_cmd.h
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 728752aa1bb..c4dba62b74a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h @@ -570,6 +570,7 @@ enum iwl_ucode_tlv_type { IWL_UCODE_TLV_INIT_EVTLOG_PTR = 11, IWL_UCODE_TLV_INIT_EVTLOG_SIZE = 12, IWL_UCODE_TLV_INIT_ERRLOG_PTR = 13, + IWL_UCODE_TLV_ENHANCE_SENS_TBL = 14, }; struct iwl_ucode_tlv { @@ -1193,7 +1194,9 @@ struct iwl_priv { u8 start_calib; struct iwl_sensitivity_data sensitivity_data; struct iwl_chain_noise_data chain_noise_data; + bool enhance_sensitivity_table; __le16 sensitivity_tbl[HD_TABLE_SIZE]; + __le16 enhance_sensitivity_tbl[ENHANCE_HD_TABLE_ENTRIES]; struct iwl_ht_config current_ht_config; @@ -1345,6 +1348,7 @@ struct iwl_priv { struct work_struct ct_enter; struct work_struct ct_exit; struct work_struct start_internal_scan; + struct work_struct tx_flush; struct tasklet_struct irq_tasklet; |