summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Puzyniak <marek.puzyniak@tieto.com>2011-09-19 15:16:51 +0200
committerPhilippe LANGLAIS <philippe.langlais@stericsson.com>2011-10-13 10:16:29 +0200
commit131faddde0f1e1d3281e5954a3e5f7aeb647547e (patch)
tree2ef3f15dd93c293867a461d5ad5772d58483e6e6
parent094b2544078c90d139f6e61cc7a54767b120d6b4 (diff)
cw1200: Enable Block ACK Policy.
Block ACK Policy was not enabled after unjoin in cw1200 driver. ST-Ericsson ID: 358471 ST-Ericsson FOSS-OUT ID: NA Signed-of-by: Marek Puzyniak <marek.puzyniak@tieto.com> Change-Id: Idcf5b2b6e582c15f33ea5e9ef1e03af9f6aefe4b Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31376 Reviewed-by: Marek PUZYNIAK <marek.puzyniak@tieto.com> Tested-by: Marek PUZYNIAK <marek.puzyniak@tieto.com> Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33524 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com> Tested-by: Dmitry TARNYAGIN <dmitry.tarnyagin@stericsson.com>
-rw-r--r--drivers/staging/cw1200/sta.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/cw1200/sta.c b/drivers/staging/cw1200/sta.c
index 49a62014b2e..47fe596f59f 100644
--- a/drivers/staging/cw1200/sta.c
+++ b/drivers/staging/cw1200/sta.c
@@ -1120,9 +1120,6 @@ void cw1200_join_work(struct work_struct *work)
wsm_flush_tx(priv);
- WARN_ON(wsm_set_block_ack_policy(priv,
- priv->ba_tid_mask, priv->ba_tid_mask));
-
/* Queue unjoin if not associated in 3 sec. */
queue_delayed_work(priv->workqueue,
&priv->join_timeout, 3 * HZ);
@@ -1143,6 +1140,8 @@ void cw1200_join_work(struct work_struct *work)
__le32_to_cpu(wsm->packetID));
priv->join_status = CW1200_JOIN_STATUS_STA;
}
+ WARN_ON(wsm_set_block_ack_policy(priv,
+ priv->ba_tid_mask, priv->ba_tid_mask));
cw1200_update_filtering(priv);
}
mutex_unlock(&priv->conf_mutex);
@@ -1203,6 +1202,8 @@ void cw1200_unjoin_work(struct work_struct *work)
cancel_work_sync(&priv->event_handler);
cancel_delayed_work_sync(&priv->connection_loss_work);
cw1200_update_listening(priv, priv->listening);
+ WARN_ON(wsm_set_block_ack_policy(priv,
+ priv->ba_tid_mask, priv->ba_tid_mask));
cw1200_update_filtering(priv);
priv->setbssparams_done = false;