diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-01-21 15:25:54 +0100 |
|---|---|---|
| committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-03-10 01:03:37 +0100 |
| commit | a4c8b2a692601de0a7bcb032b69f806050944dff (patch) | |
| tree | 29771c9383e5c91c22de5b45b21562e97710ce0d /drivers/net/wireless/iwlwifi/iwl-dev.h | |
| parent | iwlwifi: move 3945 specific data into union (diff) | |
| download | linux-a4c8b2a692601de0a7bcb032b69f806050944dff.tar.xz linux-a4c8b2a692601de0a7bcb032b69f806050944dff.zip | |
iwlwifi: move ICT data to agn part of union
Since the ICT data is all AGN specific, it can
be the first data to create the _agn part of the
device-specific union in the priv struct.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index e6cae3884879..f9210b78ffc1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h @@ -1276,19 +1276,22 @@ struct iwl_priv { u32 sta_supp_rates; } _3945; #endif +#if defined(CONFIG_IWLAGN) || defined(CONFIG_IWLAGN_MODULE) + struct { + /* INT ICT Table */ + __le32 *ict_tbl; + void *ict_tbl_vir; + dma_addr_t ict_tbl_dma; + dma_addr_t aligned_ict_tbl_dma; + int ict_index; + u32 inta; + bool use_ict; + } _agn; +#endif }; struct iwl_hw_params hw_params; - /* INT ICT Table */ - __le32 *ict_tbl; - dma_addr_t ict_tbl_dma; - dma_addr_t aligned_ict_tbl_dma; - int ict_index; - void *ict_tbl_vir; - u32 inta; - bool use_ict; - u32 inta_mask; /* Current association information needed to configure the * hardware */ |