diff options
author | Bartosz Markowski <bartosz.markowski@tieto.com> | 2012-02-29 15:14:26 +0100 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:06:38 +0200 |
commit | d23d0b764a2081af18cd9be4b35626fdd310582c (patch) | |
tree | cd1b03fd8116ea1f2d149c085caadc06eebcbd05 | |
parent | 30302840de6c28d9d8a8187915da005bc3f3008c (diff) |
cw1200: Synchronize PS and scan requestes
New PS settings shall be applied after scan finish,
to prevent overlapping request to firmware
ST-Ericsson ID: 361264
Change-Id: I6d48d570b02256cd77c6ef58fe197355b17890e1
Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/36720
Reviewed-by: QABUILD
-rw-r--r-- | drivers/staging/cw1200/sta.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/staging/cw1200/sta.c b/drivers/staging/cw1200/sta.c index 58774b926bf..570d4c6bd6f 100644 --- a/drivers/staging/cw1200/sta.c +++ b/drivers/staging/cw1200/sta.c @@ -334,8 +334,12 @@ 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 && priv->bss_params.aid) + if (priv->join_status == CW1200_JOIN_STATUS_STA && priv->bss_params.aid) { + while (down_trylock(&priv->scan.lock)) + msleep(100); cw1200_set_pm(priv, &priv->powersave_mode); + up(&priv->scan.lock); + } } #if defined(CONFIG_CW1200_USE_STE_EXTENSIONS) |