aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2010-06-14 20:09:54 -0400
committerReinette Chatre <reinette.chatre@intel.com>2010-06-21 13:47:25 -0400
commitf3aebeeebc9a18aa548f8c1da18f6cda28d8b732 (patch)
tree0943c87306cba89b40d6b7ad88568b47a871bbe4 /drivers/net/wireless/iwlwifi/iwl-agn.c
parent278fc73c0c6014bc2f55bce898bdeaa322bf4aba (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-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index fd245c4e39a1..7488a68b83b1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1461,13 +1461,13 @@ bool iwl_good_ack_health(struct iwl_priv *priv,
1461 1461
1462 actual_ack_cnt_delta = 1462 actual_ack_cnt_delta =
1463 le32_to_cpu(pkt->u.stats.tx.actual_ack_cnt) - 1463 le32_to_cpu(pkt->u.stats.tx.actual_ack_cnt) -
1464 le32_to_cpu(priv->statistics.tx.actual_ack_cnt); 1464 le32_to_cpu(priv->_agn.statistics.tx.actual_ack_cnt);
1465 expected_ack_cnt_delta = 1465 expected_ack_cnt_delta =
1466 le32_to_cpu(pkt->u.stats.tx.expected_ack_cnt) - 1466 le32_to_cpu(pkt->u.stats.tx.expected_ack_cnt) -
1467 le32_to_cpu(priv->statistics.tx.expected_ack_cnt); 1467 le32_to_cpu(priv->_agn.statistics.tx.expected_ack_cnt);
1468 ba_timeout_delta = 1468 ba_timeout_delta =
1469 le32_to_cpu(pkt->u.stats.tx.agg.ba_timeout) - 1469 le32_to_cpu(pkt->u.stats.tx.agg.ba_timeout) -
1470 le32_to_cpu(priv->statistics.tx.agg.ba_timeout); 1470 le32_to_cpu(priv->_agn.statistics.tx.agg.ba_timeout);
1471 if ((priv->_agn.agg_tids_count > 0) && 1471 if ((priv->_agn.agg_tids_count > 0) &&
1472 (expected_ack_cnt_delta > 0) && 1472 (expected_ack_cnt_delta > 0) &&
1473 (((actual_ack_cnt_delta * 100) / expected_ack_cnt_delta) 1473 (((actual_ack_cnt_delta * 100) / expected_ack_cnt_delta)
@@ -1484,10 +1484,10 @@ bool iwl_good_ack_health(struct iwl_priv *priv,
1484 * DEBUG is not, these will just compile out. 1484 * DEBUG is not, these will just compile out.
1485 */ 1485 */
1486 IWL_DEBUG_RADIO(priv, "rx_detected_cnt delta = %d\n", 1486 IWL_DEBUG_RADIO(priv, "rx_detected_cnt delta = %d\n",
1487 priv->delta_statistics.tx.rx_detected_cnt); 1487 priv->_agn.delta_statistics.tx.rx_detected_cnt);
1488 IWL_DEBUG_RADIO(priv, 1488 IWL_DEBUG_RADIO(priv,
1489 "ack_or_ba_timeout_collision delta = %d\n", 1489 "ack_or_ba_timeout_collision delta = %d\n",
1490 priv->delta_statistics.tx. 1490 priv->_agn.delta_statistics.tx.
1491 ack_or_ba_timeout_collision); 1491 ack_or_ba_timeout_collision);
1492#endif 1492#endif
1493 IWL_DEBUG_RADIO(priv, "agg ba_timeout delta = %d\n", 1493 IWL_DEBUG_RADIO(priv, "agg ba_timeout delta = %d\n",
@@ -2935,9 +2935,9 @@ static void iwl_bg_run_time_calib_work(struct work_struct *work)
2935 } 2935 }
2936 2936
2937 if (priv->start_calib) { 2937 if (priv->start_calib) {
2938 iwl_chain_noise_calibration(priv, &priv->statistics); 2938 iwl_chain_noise_calibration(priv, &priv->_agn.statistics);
2939 2939
2940 iwl_sensitivity_calibration(priv, &priv->statistics); 2940 iwl_sensitivity_calibration(priv, &priv->_agn.statistics);
2941 } 2941 }
2942 2942
2943 mutex_unlock(&priv->mutex); 2943 mutex_unlock(&priv->mutex);