summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartosz Markowski <bartosz.markowski@tieto.com>2012-02-29 15:14:25 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:06:38 +0200
commit30302840de6c28d9d8a8187915da005bc3f3008c (patch)
tree53133bab183fb5aeb7152d755ab7426af1c24d5f
parent552a5a4e166be53e5e786e0a1bfe0c0d81c4a01e (diff)
cw1200: Set PM mode only if we are associated
Set_PM_Mode request should be called only if we are associated. AID is necessary for PS mode. ST-Ericsson ID: 361264 Change-Id: I880a1009b20c304709dbe9601c90f4bc308f10ab Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/36719 Reviewed-by: QABUILD
-rw-r--r--drivers/staging/cw1200/sta.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/cw1200/sta.c b/drivers/staging/cw1200/sta.c
index 822f6a4d54e..58774b926bf 100644
--- a/drivers/staging/cw1200/sta.c
+++ b/drivers/staging/cw1200/sta.c
@@ -334,7 +334,7 @@ int cw1200_config(struct ieee80211_hw *dev, u32 changed)
priv->powersave_mode.fastPsmIdlePeriod =
conf->dynamic_ps_timeout << 1;
- if (priv->join_status == CW1200_JOIN_STATUS_STA)
+ if (priv->join_status == CW1200_JOIN_STATUS_STA && priv->bss_params.aid)
cw1200_set_pm(priv, &priv->powersave_mode);
}
@@ -1344,7 +1344,9 @@ void cw1200_unjoin_work(struct work_struct *work)
priv->ba_tid_mask, priv->ba_tid_mask));
cw1200_update_filtering(priv);
priv->setbssparams_done = false;
-
+ memset(&priv->association_mode, 0,
+ sizeof(priv->association_mode));
+ memset(&priv->bss_params, 0, sizeof(priv->bss_params));
sta_printk(KERN_DEBUG "[STA] Unjoin.\n");
}
mutex_unlock(&priv->conf_mutex);