summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <speachy@sagrad.com>2013-04-11 12:56:22 -0400
committerSolomon Peachy <speachy@sagrad.com>2013-04-11 12:57:07 -0400
commit11a79d7c711ab384220f45251a2059900c8f7469 (patch)
treee1c4c44788fe3b712dbcc3ea9cc9d10226e46550
parent39e3b0e552f47f46f88b8f98c79e8159ac779269 (diff)
downloadcompat-wireless-cw1200-11a79d7c711ab384220f45251a2059900c8f7469.tar.gz
compat-wireless-cw1200-11a79d7c711ab384220f45251a2059900c8f7469.tar.bz2
compat-wireless-cw1200-11a79d7c711ab384220f45251a2059900c8f7469.zip
delayed_unjoin takes priority over delayed_link_loss
-rw-r--r--drivers/net/wireless/cw1200/scan.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/cw1200/scan.c b/drivers/net/wireless/cw1200/scan.c
index 3fab2aa..b997e1a 100644
--- a/drivers/net/wireless/cw1200/scan.c
+++ b/drivers/net/wireless/cw1200/scan.c
@@ -262,12 +262,6 @@ fail:
static void cw1200_scan_restart_delayed(struct cw1200_common *priv)
{
- if (priv->delayed_link_loss) {
- wiphy_dbg(priv->hw->wiphy, "[CQM] Requeue BSS loss.\n");
- priv->delayed_link_loss = 0;
- cw1200_cqm_bssloss_sm(priv, 1, 0, 0);
- }
-
/* FW bug: driver has to restart p2p-dev mode after scan. */
if (priv->join_status == CW1200_JOIN_STATUS_MONITOR) {
cw1200_enable_listening(priv);
@@ -275,9 +269,15 @@ static void cw1200_scan_restart_delayed(struct cw1200_common *priv)
}
if (priv->delayed_unjoin) {
+ priv->delayed_link_loss = 0;
priv->delayed_unjoin = false;
if (queue_work(priv->workqueue, &priv->unjoin_work) <= 0)
wsm_unlock_tx(priv);
+ } else if (priv->delayed_link_loss) {
+ wiphy_dbg(priv->hw->wiphy, "[CQM] Requeue BSS loss.\n");
+ priv->delayed_link_loss = 0;
+ cw1200_cqm_bssloss_sm(priv, 1, 0, 0);
+ }
}
}