[PATCH 1/1] Remove channel parameter from smd_[start|end]_scan

Olof Johansson dev at skyshaper.net
Thu Jul 11 12:11:59 EDT 2013


The channel parameter was never necessary and removing it inline with
some cleanups.
---
 main.c | 4 ++--
 smd.c  | 8 ++++----
 smd.h  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/main.c b/main.c
index 91985a8..b69ba3f 100644
--- a/main.c
+++ b/main.c
@@ -426,14 +426,14 @@ 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, WCN36XX_HW_CHANNEL(wcn));
+	wcn36xx_smd_start_scan(wcn);
 }
 
 static void wcn36xx_sw_scan_complete(struct ieee80211_hw *hw)
 {
 	struct wcn36xx *wcn = hw->priv;
 
-	wcn36xx_smd_end_scan(wcn, WCN36XX_HW_CHANNEL(wcn));
+	wcn36xx_smd_end_scan(wcn);
 	wcn36xx_smd_finish_scan(wcn);
 }
 
diff --git a/smd.c b/smd.c
index 67cd1af..80dca8a 100644
--- a/smd.c
+++ b/smd.c
@@ -218,13 +218,13 @@ int wcn36xx_smd_init_scan(struct wcn36xx *wcn)
 	return wcn36xx_smd_send_and_wait(wcn, msg_body.header.len);
 }
 
-int wcn36xx_smd_start_scan(struct wcn36xx *wcn, int ch)
+int wcn36xx_smd_start_scan(struct wcn36xx *wcn)
 {
 	struct wcn36xx_hal_start_scan_req_msg msg_body;
 
 	INIT_HAL_MSG(msg_body, WCN36XX_HAL_START_SCAN_REQ);
 
-	msg_body.scan_channel = (u8)ch;
+	msg_body.scan_channel = WCN36XX_HW_CHANNEL(wcn);
 
 	PREPARE_HAL_BUF(wcn->smd_buf, msg_body);
 
@@ -233,13 +233,13 @@ int wcn36xx_smd_start_scan(struct wcn36xx *wcn, int ch)
 
 	return wcn36xx_smd_send_and_wait(wcn, msg_body.header.len);
 }
-int wcn36xx_smd_end_scan(struct wcn36xx *wcn, int ch)
+int wcn36xx_smd_end_scan(struct wcn36xx *wcn)
 {
 	struct wcn36xx_hal_end_scan_req_msg msg_body;
 
 	INIT_HAL_MSG(msg_body, WCN36XX_HAL_END_SCAN_REQ);
 
-	msg_body.scan_channel = (u8)ch;
+	msg_body.scan_channel = WCN36XX_HW_CHANNEL(wcn);
 
 	PREPARE_HAL_BUF(wcn->smd_buf, msg_body);
 
diff --git a/smd.h b/smd.h
index f182d76..740c7ac 100644
--- a/smd.h
+++ b/smd.h
@@ -51,8 +51,8 @@ int wcn36xx_smd_load_nv(struct wcn36xx *wcn);
 int wcn36xx_smd_start(struct wcn36xx *wcn);
 int wcn36xx_smd_stop(struct wcn36xx *wcn);
 int wcn36xx_smd_init_scan(struct wcn36xx *wcn);
-int wcn36xx_smd_start_scan(struct wcn36xx *wcn, int ch);
-int wcn36xx_smd_end_scan(struct wcn36xx *wcn, int ch);
+int wcn36xx_smd_start_scan(struct wcn36xx *wcn);
+int wcn36xx_smd_end_scan(struct wcn36xx *wcn);
 int wcn36xx_smd_finish_scan(struct wcn36xx *wcn);
 int wcn36xx_smd_update_scan_params(struct wcn36xx *wcn);
 int wcn36xx_smd_add_sta_self(struct wcn36xx *wcn, u8 *addr, u32 status);
-- 
1.8.3.1




More information about the wcn36xx mailing list