diff options
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-04-30 17:21:48 -0400 |
|---|---|---|
| committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-05-13 13:42:45 -0400 |
| commit | a2064b7a4a22d118087898e4308670da7ac07911 (patch) | |
| tree | 1951ff14c67fa8a34fa28ca0aa112a6e8a777c51 /drivers/net/wireless/iwlwifi/iwl-dev.h | |
| parent | 0af8bcae6f44aa440e51b1925635fb835cd68058 (diff) | |
iwlwifi: move _agn statistics related structure
agn and 3945 has different statistics_notif data structure; since 3945
has it statistics_notif data structure inside the _3945 portion of
iwl_priv, it make sense to move the agn statistics_notif into _agn portion.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@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 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index f3f3473c5c7e..858a548330a5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
| @@ -1220,13 +1220,6 @@ struct iwl_priv { | |||
| 1220 | struct iwl_power_mgr power_data; | 1220 | struct iwl_power_mgr power_data; |
| 1221 | struct iwl_tt_mgmt thermal_throttle; | 1221 | struct iwl_tt_mgmt thermal_throttle; |
| 1222 | 1222 | ||
| 1223 | struct iwl_notif_statistics statistics; | ||
| 1224 | #ifdef CONFIG_IWLWIFI_DEBUG | ||
| 1225 | struct iwl_notif_statistics accum_statistics; | ||
| 1226 | struct iwl_notif_statistics delta_statistics; | ||
| 1227 | struct iwl_notif_statistics max_delta; | ||
| 1228 | #endif | ||
| 1229 | |||
| 1230 | /* context information */ | 1223 | /* context information */ |
| 1231 | u8 bssid[ETH_ALEN]; /* used only on 3945 but filled by core */ | 1224 | u8 bssid[ETH_ALEN]; /* used only on 3945 but filled by core */ |
| 1232 | u8 mac_addr[ETH_ALEN]; | 1225 | u8 mac_addr[ETH_ALEN]; |
| @@ -1315,6 +1308,13 @@ struct iwl_priv { | |||
| 1315 | bool last_phy_res_valid; | 1308 | bool last_phy_res_valid; |
| 1316 | 1309 | ||
| 1317 | struct completion firmware_loading_complete; | 1310 | struct completion firmware_loading_complete; |
| 1311 | |||
| 1312 | struct iwl_notif_statistics statistics; | ||
| 1313 | #ifdef CONFIG_IWLWIFI_DEBUG | ||
| 1314 | struct iwl_notif_statistics accum_statistics; | ||
| 1315 | struct iwl_notif_statistics delta_statistics; | ||
| 1316 | struct iwl_notif_statistics max_delta; | ||
| 1317 | #endif | ||
| 1318 | } _agn; | 1318 | } _agn; |
| 1319 | #endif | 1319 | #endif |
| 1320 | }; | 1320 | }; |