Reduce the bssloss attempts. And get rid of the WARN_ON.

This commit is contained in:
Solomon Peachy 2013-04-11 12:51:56 -04:00
parent c0f3c2b968
commit 39e3b0e552
1 changed files with 5 additions and 4 deletions

View File

@ -149,9 +149,10 @@ void __cw1200_cqm_bssloss_sm(struct cw1200_common *priv, int init, int good, int
priv->delayed_link_loss = 0;
cancel_work_sync(&priv->bss_params_work);
pr_debug("[STA] CQM BSSLOSS_SM: state: %d init %d good %d bad: %d\n",
pr_debug("[STA] CQM BSSLOSS_SM: state: %d init %d good %d bad: %d txlock: %d\n",
priv->bss_loss_state,
init, good, bad);
init, good, bad,
atomic_read(&priv->tx_lock));
if (init) {
queue_delayed_work(priv->workqueue,
@ -160,7 +161,7 @@ void __cw1200_cqm_bssloss_sm(struct cw1200_common *priv, int init, int good, int
priv->bss_loss_state = 0;
/* Skip the confimration procedure in P2P case */
if (!priv->vif->p2p && !WARN_ON(atomic_read(&priv->tx_lock)))
if (!priv->vif->p2p && !atomic_read(&priv->tx_lock))
tx = 1;
} else if (good) {
cancel_delayed_work_sync(&priv->bss_loss_work);
@ -168,7 +169,7 @@ void __cw1200_cqm_bssloss_sm(struct cw1200_common *priv, int init, int good, int
queue_work(priv->workqueue, &priv->bss_params_work);
} else if (bad) {
/* XXX Should we just keep going until we time out? */
if (priv->bss_loss_state < 10)
if (priv->bss_loss_state < 3)
tx = 1;
} else {
cancel_delayed_work_sync(&priv->bss_loss_work);