From 131faddde0f1e1d3281e5954a3e5f7aeb647547e Mon Sep 17 00:00:00 2001 From: Marek Puzyniak Date: Mon, 19 Sep 2011 15:16:51 +0200 Subject: 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 Change-Id: Idcf5b2b6e582c15f33ea5e9ef1e03af9f6aefe4b Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31376 Reviewed-by: Marek PUZYNIAK Tested-by: Marek PUZYNIAK Reviewed-by: Bartosz MARKOWSKI Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33524 Reviewed-by: Philippe LANGLAIS Tested-by: Dmitry TARNYAGIN --- drivers/staging/cw1200/sta.c | 7 ++++--- 1 file 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; -- cgit v1.2.3