aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/scan.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/mwifiex/scan.c')
-rw-r--r--drivers/net/wireless/mwifiex/scan.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 5456dcbf037c..dae8dbb24a03 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -172,29 +172,6 @@ mwifiex_ssid_cmp(struct mwifiex_802_11_ssid *ssid1,
172} 172}
173 173
174/* 174/*
175 * Sends IOCTL request to start a scan with user configurations.
176 *
177 * This function allocates the IOCTL request buffer, fills it
178 * with requisite parameters and calls the IOCTL handler.
179 *
180 * Upon completion, it also generates a wireless event to notify
181 * applications.
182 */
183int mwifiex_set_user_scan_ioctl(struct mwifiex_private *priv,
184 struct mwifiex_user_scan_cfg *scan_req)
185{
186 int status;
187
188 priv->adapter->scan_wait_q_woken = false;
189
190 status = mwifiex_scan_networks(priv, scan_req);
191 if (!status)
192 status = mwifiex_wait_queue_complete(priv->adapter);
193
194 return status;
195}
196
197/*
198 * This function checks if wapi is enabled in driver and scanned network is 175 * This function checks if wapi is enabled in driver and scanned network is
199 * compatible with it. 176 * compatible with it.
200 */ 177 */
@@ -1316,8 +1293,8 @@ mwifiex_radio_type_to_band(u8 radio_type)
1316 * order to send the appropriate scan commands to firmware to populate or 1293 * order to send the appropriate scan commands to firmware to populate or
1317 * update the internal driver scan table. 1294 * update the internal driver scan table.
1318 */ 1295 */
1319int mwifiex_scan_networks(struct mwifiex_private *priv, 1296static int mwifiex_scan_networks(struct mwifiex_private *priv,
1320 const struct mwifiex_user_scan_cfg *user_scan_in) 1297 const struct mwifiex_user_scan_cfg *user_scan_in)
1321{ 1298{
1322 int ret = 0; 1299 int ret = 0;
1323 struct mwifiex_adapter *adapter = priv->adapter; 1300 struct mwifiex_adapter *adapter = priv->adapter;
@@ -1399,6 +1376,29 @@ int mwifiex_scan_networks(struct mwifiex_private *priv,
1399} 1376}
1400 1377
1401/* 1378/*
1379 * Sends IOCTL request to start a scan with user configurations.
1380 *
1381 * This function allocates the IOCTL request buffer, fills it
1382 * with requisite parameters and calls the IOCTL handler.
1383 *
1384 * Upon completion, it also generates a wireless event to notify
1385 * applications.
1386 */
1387int mwifiex_set_user_scan_ioctl(struct mwifiex_private *priv,
1388 struct mwifiex_user_scan_cfg *scan_req)
1389{
1390 int status;
1391
1392 priv->adapter->scan_wait_q_woken = false;
1393
1394 status = mwifiex_scan_networks(priv, scan_req);
1395 if (!status)
1396 status = mwifiex_wait_queue_complete(priv->adapter);
1397
1398 return status;
1399}
1400
1401/*
1402 * This function prepares a scan command to be sent to the firmware. 1402 * This function prepares a scan command to be sent to the firmware.
1403 * 1403 *
1404 * This uses the scan command configuration sent to the command processing 1404 * This uses the scan command configuration sent to the command processing