141 lines
5.2 KiB
Diff
141 lines
5.2 KiB
Diff
Backport of the following upstream commit...
|
|
|
|
commit 872c8ddcbec06995c1c7caa3e41c921290a8b6df
|
|
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
|
|
Date: Tue Mar 16 10:46:31 2010 -0700
|
|
|
|
iwlwifi: iwl_good_ack_health() only apply to AGN device
|
|
|
|
iwl_good_ack_health() check for expected and actual ack count which only
|
|
apply to aggregation mode. Move the function to iwlagn module.
|
|
|
|
Reported-by: Chantry Xavier <chantry.xavier@gmail.com>
|
|
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
|
|
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
|
|
|
|
diff -up linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c.orig linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c
|
|
--- linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c.orig 2010-04-13 15:15:47.000000000 -0400
|
|
+++ linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-agn.c 2010-04-13 15:20:00.000000000 -0400
|
|
@@ -1316,6 +1316,52 @@ static void iwl_irq_tasklet(struct iwl_p
|
|
iwl_enable_interrupts(priv);
|
|
}
|
|
|
|
+/* the threshold ratio of actual_ack_cnt to expected_ack_cnt in percent */
|
|
+#define ACK_CNT_RATIO (50)
|
|
+#define BA_TIMEOUT_CNT (5)
|
|
+#define BA_TIMEOUT_MAX (16)
|
|
+
|
|
+/**
|
|
+ * iwl_good_ack_health - checks for ACK count ratios, BA timeout retries.
|
|
+ *
|
|
+ * When the ACK count ratio is 0 and aggregated BA timeout retries exceeding
|
|
+ * the BA_TIMEOUT_MAX, reload firmware and bring system back to normal
|
|
+ * operation state.
|
|
+ */
|
|
+bool iwl_good_ack_health(struct iwl_priv *priv,
|
|
+ struct iwl_rx_packet *pkt)
|
|
+{
|
|
+ bool rc = true;
|
|
+ int actual_ack_cnt_delta, expected_ack_cnt_delta;
|
|
+ int ba_timeout_delta;
|
|
+
|
|
+ actual_ack_cnt_delta =
|
|
+ le32_to_cpu(pkt->u.stats.tx.actual_ack_cnt) -
|
|
+ le32_to_cpu(priv->statistics.tx.actual_ack_cnt);
|
|
+ expected_ack_cnt_delta =
|
|
+ le32_to_cpu(pkt->u.stats.tx.expected_ack_cnt) -
|
|
+ le32_to_cpu(priv->statistics.tx.expected_ack_cnt);
|
|
+ ba_timeout_delta =
|
|
+ le32_to_cpu(pkt->u.stats.tx.agg.ba_timeout) -
|
|
+ le32_to_cpu(priv->statistics.tx.agg.ba_timeout);
|
|
+ if ((priv->agg_tids_count > 0) &&
|
|
+ (expected_ack_cnt_delta > 0) &&
|
|
+ (((actual_ack_cnt_delta * 100) / expected_ack_cnt_delta)
|
|
+ < ACK_CNT_RATIO) &&
|
|
+ (ba_timeout_delta > BA_TIMEOUT_CNT)) {
|
|
+ IWL_DEBUG_RADIO(priv, "actual_ack_cnt delta = %d,"
|
|
+ " expected_ack_cnt = %d\n",
|
|
+ actual_ack_cnt_delta, expected_ack_cnt_delta);
|
|
+
|
|
+ IWL_DEBUG_RADIO(priv, "agg ba_timeout delta = %d\n",
|
|
+ ba_timeout_delta);
|
|
+ if (!actual_ack_cnt_delta &&
|
|
+ (ba_timeout_delta >= BA_TIMEOUT_MAX))
|
|
+ rc = false;
|
|
+ }
|
|
+ return rc;
|
|
+}
|
|
+
|
|
|
|
/******************************************************************************
|
|
*
|
|
diff -up linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-core.h.orig linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-core.h
|
|
--- linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-core.h.orig 2010-04-13 15:15:47.000000000 -0400
|
|
+++ linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-core.h 2010-04-13 15:18:13.000000000 -0400
|
|
@@ -584,6 +584,8 @@ void iwl_disable_ict(struct iwl_priv *pr
|
|
int iwl_alloc_isr_ict(struct iwl_priv *priv);
|
|
void iwl_free_isr_ict(struct iwl_priv *priv);
|
|
irqreturn_t iwl_isr_ict(int irq, void *data);
|
|
+bool iwl_good_ack_health(struct iwl_priv *priv,
|
|
+ struct iwl_rx_packet *pkt);
|
|
|
|
static inline u16 iwl_pcie_link_ctl(struct iwl_priv *priv)
|
|
{
|
|
diff -up linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c.orig linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c
|
|
--- linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c.orig 2010-04-13 15:15:47.000000000 -0400
|
|
+++ linux-2.6.33.noarch/drivers/net/wireless/iwlwifi/iwl-rx.c 2010-04-13 15:18:52.000000000 -0400
|
|
@@ -593,53 +593,6 @@ static void iwl_accumulative_statistics(
|
|
|
|
#define REG_RECALIB_PERIOD (60)
|
|
|
|
-/* the threshold ratio of actual_ack_cnt to expected_ack_cnt in percent */
|
|
-#define ACK_CNT_RATIO (50)
|
|
-#define BA_TIMEOUT_CNT (5)
|
|
-#define BA_TIMEOUT_MAX (16)
|
|
-
|
|
-/**
|
|
- * iwl_good_ack_health - checks for ACK count ratios, BA timeout retries.
|
|
- *
|
|
- * When the ACK count ratio is 0 and aggregated BA timeout retries exceeding
|
|
- * the BA_TIMEOUT_MAX, reload firmware and bring system back to normal
|
|
- * operation state.
|
|
- */
|
|
-bool iwl_good_ack_health(struct iwl_priv *priv,
|
|
- struct iwl_rx_packet *pkt)
|
|
-{
|
|
- bool rc = true;
|
|
- int actual_ack_cnt_delta, expected_ack_cnt_delta;
|
|
- int ba_timeout_delta;
|
|
-
|
|
- actual_ack_cnt_delta =
|
|
- le32_to_cpu(pkt->u.stats.tx.actual_ack_cnt) -
|
|
- le32_to_cpu(priv->statistics.tx.actual_ack_cnt);
|
|
- expected_ack_cnt_delta =
|
|
- le32_to_cpu(pkt->u.stats.tx.expected_ack_cnt) -
|
|
- le32_to_cpu(priv->statistics.tx.expected_ack_cnt);
|
|
- ba_timeout_delta =
|
|
- le32_to_cpu(pkt->u.stats.tx.agg.ba_timeout) -
|
|
- le32_to_cpu(priv->statistics.tx.agg.ba_timeout);
|
|
- if ((priv->agg_tids_count > 0) &&
|
|
- (expected_ack_cnt_delta > 0) &&
|
|
- (((actual_ack_cnt_delta * 100) / expected_ack_cnt_delta)
|
|
- < ACK_CNT_RATIO) &&
|
|
- (ba_timeout_delta > BA_TIMEOUT_CNT)) {
|
|
- IWL_DEBUG_RADIO(priv, "actual_ack_cnt delta = %d,"
|
|
- " expected_ack_cnt = %d\n",
|
|
- actual_ack_cnt_delta, expected_ack_cnt_delta);
|
|
-
|
|
- IWL_DEBUG_RADIO(priv, "agg ba_timeout delta = %d\n",
|
|
- ba_timeout_delta);
|
|
- if (!actual_ack_cnt_delta &&
|
|
- (ba_timeout_delta >= BA_TIMEOUT_MAX))
|
|
- rc = false;
|
|
- }
|
|
- return rc;
|
|
-}
|
|
-EXPORT_SYMBOL(iwl_good_ack_health);
|
|
-
|
|
/**
|
|
* iwl_good_plcp_health - checks for plcp error.
|
|
*
|