summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzymon Bigos <szymon.bigos@tieto.com>2012-02-29 15:15:24 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:06:47 +0200
commite6e50032257783c06d65c4c6d0e302cf597adc9e (patch)
treea7b0dc20494efebefdb7f07bcabbcc8ff6adc618
parent8dbf0822728423475733c21d42a19c52479d812e (diff)
cw1200: Fix disabling BlockAck on scan.
Traffic is measured during scan, so BlockAck was often disabled during/after scan. Now low traffic during scan does not increase low traffic history. ST-Ericsson ID: 405634, 407777 ST-Ericsson FOSS-OUT ID: NA Change-Id: Iff863c36fdbed870669a0835125249cca34954e9 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/43859 Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Tested-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com>
-rw-r--r--drivers/staging/cw1200/sta.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/staging/cw1200/sta.c b/drivers/staging/cw1200/sta.c
index c5b79f25060..a540a592fdd 100644
--- a/drivers/staging/cw1200/sta.c
+++ b/drivers/staging/cw1200/sta.c
@@ -1580,6 +1580,9 @@ void cw1200_ba_timer(unsigned long arg)
spin_lock_bh(&priv->ba_lock);
cw1200_debug_ba(priv, priv->ba_cnt, priv->ba_acc);
+ if (atomic_read(&priv->scan.in_progress))
+ goto skip_statistic_update;
+
ba_ena = (priv->ba_cnt >= CW1200_BLOCK_ACK_CNT &&
priv->ba_acc / priv->ba_cnt >= CW1200_BLOCK_ACK_THLD);
priv->ba_cnt = 0;
@@ -1596,6 +1599,7 @@ void cw1200_ba_timer(unsigned long arg)
} else if (priv->ba_hist)
--priv->ba_hist;
+skip_statistic_update:
spin_unlock_bh(&priv->ba_lock);
}