summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <speachy@sagrad.com>2013-04-11 13:12:33 -0400
committerSolomon Peachy <speachy@sagrad.com>2013-04-11 13:13:03 -0400
commitcb9d4bbcd20dab82190460cb63701193163c4191 (patch)
tree807c1e3d0f7f6eb11eb83cba27f02725b4005938
parent11a79d7c711ab384220f45251a2059900c8f7469 (diff)
downloadcompat-wireless-cw1200-cb9d4bbcd20dab82190460cb63701193163c4191.tar.gz
compat-wireless-cw1200-cb9d4bbcd20dab82190460cb63701193163c4191.tar.bz2
compat-wireless-cw1200-cb9d4bbcd20dab82190460cb63701193163c4191.zip
Add extra debugging in scans. And clean up delayed_bss_loss
-rw-r--r--drivers/net/wireless/cw1200/scan.c5
-rw-r--r--drivers/net/wireless/cw1200/sta.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/cw1200/scan.c b/drivers/net/wireless/cw1200/scan.c
index b997e1a..f54e6cb 100644
--- a/drivers/net/wireless/cw1200/scan.c
+++ b/drivers/net/wireless/cw1200/scan.c
@@ -30,6 +30,9 @@ static int cw1200_scan_start(struct cw1200_common *priv, struct wsm_scan *scan)
break;
}
+ wiphy_dbg(priv->hw->wiphy, "[SCAN] hw req, type %d, %d channels, flags: 0x%x.\n",
+ scan->type, scan->num_channels, scan->flags);
+
for (i = 0; i < scan->num_channels; ++i)
tmo += scan->ch[i].max_chan_time + 10;
@@ -269,7 +272,6 @@ 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);
@@ -277,7 +279,6 @@ static void cw1200_scan_restart_delayed(struct cw1200_common *priv)
wiphy_dbg(priv->hw->wiphy, "[CQM] Requeue BSS loss.\n");
priv->delayed_link_loss = 0;
cw1200_cqm_bssloss_sm(priv, 1, 0, 0);
- }
}
}
diff --git a/drivers/net/wireless/cw1200/sta.c b/drivers/net/wireless/cw1200/sta.c
index 201c633..851e8b8 100644
--- a/drivers/net/wireless/cw1200/sta.c
+++ b/drivers/net/wireless/cw1200/sta.c
@@ -1386,6 +1386,8 @@ static void cw1200_do_unjoin(struct cw1200_common *priv)
goto done;
}
+ priv->delayed_link_loss = false;
+
if (!priv->join_status)
goto done;