[PATCH v2 1/4] Clean up scanning functions and printouts
Olof Johansson
dev at skyshaper.net
Mon Jun 10 01:56:38 EDT 2013
The is_scanning state is no longer needed and was an unfortunate
leftover from earlier.
The scanning works well enough to not have it using info prints any
more.
Signed-off-by: Olof Johansson <dev at skyshaper.net>
---
main.c | 6 ++----
smd.c | 2 +-
wcn36xx.h | 2 --
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/main.c b/main.c
index c995ca0..ae67b46 100644
--- a/main.c
+++ b/main.c
@@ -142,7 +142,7 @@ static int wcn36xx_config(struct ieee80211_hw *hw,
u32 changed)
if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
wcn->ch = hw->conf.chandef.chan->hw_value;
wcn->current_channel = hw->conf.chandef.chan;
- wcn36xx_info("wcn36xx_config channel switch=%d", wcn->ch);
+ wcn36xx_dbg(WCN36XX_DBG_MAC, "wcn36xx_config channel switch=%d", wcn->ch);
wcn36xx_smd_switch_channel_req(wcn, wcn->ch);
}
@@ -261,20 +261,18 @@ out:
static void wcn36xx_sw_scan_start(struct ieee80211_hw *hw)
{
-
struct wcn36xx *wcn = hw->priv;
wcn36xx_smd_init_scan(wcn);
wcn36xx_smd_start_scan(wcn, wcn->ch);
- wcn->is_scanning = 1;
}
static void wcn36xx_sw_scan_complete(struct ieee80211_hw *hw)
{
struct wcn36xx *wcn = hw->priv;
+
wcn36xx_smd_end_scan(wcn, wcn->ch);
wcn36xx_smd_finish_scan(wcn);
- wcn->is_scanning = 0;
}
static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw,
diff --git a/smd.c b/smd.c
index c67a057..267b69e 100644
--- a/smd.c
+++ b/smd.c
@@ -273,7 +273,7 @@ static void wcn36xx_smd_switch_channel_rsp(void
*buf, size_t len)
{
struct wcn36xx_hal_switch_channel_rsp_msg *rsp;
rsp = (struct wcn36xx_hal_switch_channel_rsp_msg *)buf;
- wcn36xx_info("channel switched to: %d, status: %d", rsp->channel_number,
+ wcn36xx_dbg(WCN36XX_DBG_HAL, "channel switched to: %d, status: %d",
rsp->channel_number,
rsp->status);
}
diff --git a/wcn36xx.h b/wcn36xx.h
index 28c86ea..37643c7 100644
--- a/wcn36xx.h
+++ b/wcn36xx.h
@@ -140,8 +140,6 @@ struct wcn36xx {
struct work_struct rx_ready_work;
struct completion smd_compl;
- /* Scanning */
- int is_scanning;
bool is_joining;
/* DXE channels */
--
1.8.2.2
More information about the wcn36xx
mailing list