diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-07-14 08:07:27 -0700 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-07-23 08:40:47 -0700 |
commit | 325322ee34d726bff922853d509e135c8d262e2f (patch) | |
tree | 543f6638b7b2a7b19d4c082e0f9f89fa6094c25f /drivers/net/wireless/iwlwifi/iwl-agn-rx.c | |
parent | 7a17a33c0da37f8d24222c967550d19dabf13617 (diff) | |
download | blackbird-op-linux-325322ee34d726bff922853d509e135c8d262e2f.tar.gz blackbird-op-linux-325322ee34d726bff922853d509e135c8d262e2f.zip |
iwlagn: add statistic notification structure for WiFi/BT devices
If its WiFi/BT combo device, the statistics notification sent by
uCode will include the additional BT related statistics counters.
Adding new data structure to support the new layout.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rx.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rx.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c index d54edc326f81..249b77bbf638 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c @@ -135,12 +135,12 @@ static void iwl_accumulative_statistics(struct iwl_priv *priv, } /* reset accumulative statistics for "no-counter" type statistics */ - priv->_agn.accum_statistics.general.temperature = - priv->_agn.statistics.general.temperature; - priv->_agn.accum_statistics.general.temperature_m = - priv->_agn.statistics.general.temperature_m; - priv->_agn.accum_statistics.general.ttl_timestamp = - priv->_agn.statistics.general.ttl_timestamp; + priv->_agn.accum_statistics.general.common.temperature = + priv->_agn.statistics.general.common.temperature; + priv->_agn.accum_statistics.general.common.temperature_m = + priv->_agn.statistics.general.common.temperature_m; + priv->_agn.accum_statistics.general.common.ttl_timestamp = + priv->_agn.statistics.general.common.ttl_timestamp; priv->_agn.accum_statistics.tx.tx_power.ant_a = priv->_agn.statistics.tx.tx_power.ant_a; priv->_agn.accum_statistics.tx.tx_power.ant_b = @@ -232,8 +232,8 @@ void iwl_rx_statistics(struct iwl_priv *priv, (int)sizeof(priv->_agn.statistics), le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK); - change = ((priv->_agn.statistics.general.temperature != - pkt->u.stats.general.temperature) || + change = ((priv->_agn.statistics.general.common.temperature != + pkt->u.stats.general.common.temperature) || ((priv->_agn.statistics.flag & STATISTICS_REPLY_FLG_HT40_MODE_MSK) != (pkt->u.stats.flag & STATISTICS_REPLY_FLG_HT40_MODE_MSK))); |