diff options
| author | Bartosz Markowski <bartosz.markowski@tieto.com> | 2012-02-29 15:14:24 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:06:38 +0200 |
| commit | 552a5a4e166be53e5e786e0a1bfe0c0d81c4a01e (patch) | |
| tree | 1386af7e7ded7db03f6eb203fd161d79f6a56ac4 | |
| parent | 00ec8f311ab77b5caf470e034cda26aea50f4b6d (diff) | |
cw1200: Disable AP-keep-alive before reset
Disabling keep-alive right before reset request
to firmware and reenable it after successfull
association.
ST-Ericsson ID: 361264
Change-Id: Ib6f47d89de69ef3bdb01761aa8bcb9fe58d8b3df
Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/36718
Reviewed-by: QABUILD
| -rwxr-xr-x | drivers/staging/cw1200/ap.c | 1 | ||||
| -rw-r--r-- | drivers/staging/cw1200/sta.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/cw1200/ap.c b/drivers/staging/cw1200/ap.c index d1dbcb759d1..f09d9031d0f 100755 --- a/drivers/staging/cw1200/ap.c +++ b/drivers/staging/cw1200/ap.c @@ -452,6 +452,7 @@ void cw1200_bss_info_changed(struct ieee80211_hw *dev, priv->association_mode.basicRateSet); WARN_ON(wsm_set_association_mode(priv, &priv->association_mode)); + WARN_ON(wsm_keep_alive_period(priv, 30 /* sec */)); WARN_ON(wsm_set_bss_params(priv, &priv->bss_params)); priv->setbssparams_done = true; WARN_ON(wsm_set_beacon_wakeup_period(priv, diff --git a/drivers/staging/cw1200/sta.c b/drivers/staging/cw1200/sta.c index 6c216917d44..822f6a4d54e 100644 --- a/drivers/staging/cw1200/sta.c +++ b/drivers/staging/cw1200/sta.c @@ -1274,7 +1274,6 @@ void cw1200_join_work(struct work_struct *work) } else { /* Upload keys */ WARN_ON(cw1200_upload_keys(priv)); - WARN_ON(wsm_keep_alive_period(priv, 30 /* sec */)); cw1200_queue_requeue(queue, priv->pending_frame_id); priv->join_status = CW1200_JOIN_STATUS_STA; } @@ -1333,6 +1332,7 @@ void cw1200_unjoin_work(struct work_struct *work) /* Unjoin is a reset. */ wsm_flush_tx(priv); + WARN_ON(wsm_keep_alive_period(priv, 0)); WARN_ON(wsm_reset(priv, &reset)); priv->join_dtim_period = 0; WARN_ON(cw1200_setup_mac(priv)); |