cfg80211.c (58527421489dcc1110f6bcfd3b50d479199af4e0) cfg80211.c (74997a53d257e327699e359b78b3ecfd33f80cab)
1/*
2 * Copyright (c) 2012-2016 Qualcomm Atheros, Inc.
3 *
4 * Permission to use, copy, modify, and/or distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
7 *
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

--- 305 unchanged lines hidden (view full) ---

314 wil_err(wil, "set SSID for scan request failed: %d\n", rc);
315 return rc;
316 }
317
318 wil->scan_request = request;
319 mod_timer(&wil->scan_timer, jiffies + WIL6210_SCAN_TO);
320
321 memset(&cmd, 0, sizeof(cmd));
1/*
2 * Copyright (c) 2012-2016 Qualcomm Atheros, Inc.
3 *
4 * Permission to use, copy, modify, and/or distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
7 *
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

--- 305 unchanged lines hidden (view full) ---

314 wil_err(wil, "set SSID for scan request failed: %d\n", rc);
315 return rc;
316 }
317
318 wil->scan_request = request;
319 mod_timer(&wil->scan_timer, jiffies + WIL6210_SCAN_TO);
320
321 memset(&cmd, 0, sizeof(cmd));
322 cmd.cmd.scan_type = WMI_ACTIVE_SCAN;
322 cmd.cmd.num_channels = 0;
323 n = min(request->n_channels, 4U);
324 for (i = 0; i < n; i++) {
325 int ch = request->channels[i]->hw_value;
326
327 if (ch == 0) {
328 wil_err(wil,
329 "Scan requested for unknown frequency %dMhz\n",

--- 11 unchanged lines hidden (view full) ---

341 request->ie, request->ie_len);
342 else
343 wil_dbg_misc(wil, "Scan has no IE's\n");
344
345 rc = wmi_set_ie(wil, WMI_FRAME_PROBE_REQ, request->ie_len, request->ie);
346 if (rc)
347 goto out;
348
323 cmd.cmd.num_channels = 0;
324 n = min(request->n_channels, 4U);
325 for (i = 0; i < n; i++) {
326 int ch = request->channels[i]->hw_value;
327
328 if (ch == 0) {
329 wil_err(wil,
330 "Scan requested for unknown frequency %dMhz\n",

--- 11 unchanged lines hidden (view full) ---

342 request->ie, request->ie_len);
343 else
344 wil_dbg_misc(wil, "Scan has no IE's\n");
345
346 rc = wmi_set_ie(wil, WMI_FRAME_PROBE_REQ, request->ie_len, request->ie);
347 if (rc)
348 goto out;
349
350 if (wil->discovery_mode && cmd.cmd.scan_type == WMI_ACTIVE_SCAN) {
351 cmd.cmd.discovery_mode = 1;
352 wil_dbg_misc(wil, "active scan with discovery_mode=1\n");
353 }
354
349 rc = wmi_send(wil, WMI_START_SCAN_CMDID, &cmd, sizeof(cmd.cmd) +
350 cmd.cmd.num_channels * sizeof(cmd.cmd.channel_list[0]));
351
352out:
353 if (rc) {
354 del_timer_sync(&wil->scan_timer);
355 wil->scan_request = NULL;
356 }

--- 965 unchanged lines hidden --- 		355 rc = wmi_send(wil, WMI_START_SCAN_CMDID, &cmd, sizeof(cmd.cmd) +
356 cmd.cmd.num_channels * sizeof(cmd.cmd.channel_list[0]));
357
358out:
359 if (rc) {
360 del_timer_sync(&wil->scan_timer);
361 wil->scan_request = NULL;
362 }

--- 965 unchanged lines hidden ---