From e6e50032257783c06d65c4c6d0e302cf597adc9e Mon Sep 17 00:00:00 2001 From: Szymon Bigos Date: Wed, 29 Feb 2012 15:15:24 +0100 Subject: 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 Tested-by: Bartosz MARKOWSKI --- drivers/staging/cw1200/sta.c | 4 ++++ 1 file changed, 4 insertions(+) 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); } -- cgit v1.2.3