diff options
author | Johannes Berg <johannes.berg@intel.com> | 2011-04-08 11:14:56 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-04-08 11:19:00 -0400 |
commit | 0da0e5bf1522d75d446f5124e17016628d0a149e (patch) | |
tree | 86d9c4986be873fb834b54a4d9075330743c0f03 /drivers/net/wireless/iwlwifi/iwl-core.h | |
parent | 703bc583cb98a24eeedd297ee59dfa12852897d1 (diff) |
iwlagn: clean up & autodetect statistics
There's no need to keep both normal and BT statistics
versions around all the time in memory when we only
use a subset of both. So keep only the subsets that
we need in memory, depending on the debug config).
Also, in doing so, we can remove all the calls to
iwl_bt_statistics() in the driver as we'll just
access the copied statistics now.
Finally, also remove this call from the one place
where it might still be needed and automatically
detect what kind of statistics the device is sending
based on their size. This way, we don't need to keep
track of which devices do what any more, which is
good since this is subject to change based on the
ucode version (as some ucode even for non-BT devices
will in fact use BT statistics).
Warn upon encountering a statistics command from the
ucode that isn't known, so we will find such issues
earlier in the future.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Tested-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index 57763c013ca..6988335328e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
@@ -279,7 +279,6 @@ struct iwl_base_params { | |||
279 | * @advanced_bt_coexist: support advanced bt coexist | 279 | * @advanced_bt_coexist: support advanced bt coexist |
280 | * @bt_init_traffic_load: specify initial bt traffic load | 280 | * @bt_init_traffic_load: specify initial bt traffic load |
281 | * @bt_prio_boost: default bt priority boost value | 281 | * @bt_prio_boost: default bt priority boost value |
282 | * @bt_statistics: use BT version of statistics notification | ||
283 | * @agg_time_limit: maximum number of uSec in aggregation | 282 | * @agg_time_limit: maximum number of uSec in aggregation |
284 | * @ampdu_factor: Maximum A-MPDU length factor | 283 | * @ampdu_factor: Maximum A-MPDU length factor |
285 | * @ampdu_density: Minimum A-MPDU spacing | 284 | * @ampdu_density: Minimum A-MPDU spacing |
@@ -289,7 +288,6 @@ struct iwl_bt_params { | |||
289 | bool advanced_bt_coexist; | 288 | bool advanced_bt_coexist; |
290 | u8 bt_init_traffic_load; | 289 | u8 bt_init_traffic_load; |
291 | u8 bt_prio_boost; | 290 | u8 bt_prio_boost; |
292 | const bool bt_statistics; | ||
293 | u16 agg_time_limit; | 291 | u16 agg_time_limit; |
294 | u8 ampdu_factor; | 292 | u8 ampdu_factor; |
295 | u8 ampdu_density; | 293 | u8 ampdu_density; |
@@ -696,11 +694,6 @@ static inline bool iwl_advanced_bt_coexist(struct iwl_priv *priv) | |||
696 | priv->cfg->bt_params->advanced_bt_coexist; | 694 | priv->cfg->bt_params->advanced_bt_coexist; |
697 | } | 695 | } |
698 | 696 | ||
699 | static inline bool iwl_bt_statistics(struct iwl_priv *priv) | ||
700 | { | ||
701 | return priv->bt_statistics; | ||
702 | } | ||
703 | |||
704 | extern bool bt_coex_active; | 697 | extern bool bt_coex_active; |
705 | extern bool bt_siso_mode; | 698 | extern bool bt_siso_mode; |
706 | 699 | ||