2497a246e8
DFS channels were never getting included in the scheduled scans, because they always contain the passive flag as well and the call was asking for DFS and active channels. Fix this by ignoring the passive flag when collecting DFS channels. Also, move the DFS channels in the channel list before the 5GHz active channels (this was implemented in the FW differently than specified). Signed-off-by: Luciano Coelho <coelho@ti.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
227 lines
5.3 KiB
C
227 lines
5.3 KiB
C
/*
|
|
* This file is part of wl1271
|
|
*
|
|
* Copyright (C) 2009-2010 Nokia Corporation
|
|
*
|
|
* Contact: Luciano Coelho <luciano.coelho@nokia.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* version 2 as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
|
|
* 02110-1301 USA
|
|
*
|
|
*/
|
|
|
|
#ifndef __SCAN_H__
|
|
#define __SCAN_H__
|
|
|
|
#include "wl12xx.h"
|
|
|
|
int wl1271_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,
|
|
struct cfg80211_scan_request *req);
|
|
int wl1271_scan_build_probe_req(struct wl1271 *wl,
|
|
const u8 *ssid, size_t ssid_len,
|
|
const u8 *ie, size_t ie_len, u8 band);
|
|
void wl1271_scan_stm(struct wl1271 *wl);
|
|
void wl1271_scan_complete_work(struct work_struct *work);
|
|
int wl1271_scan_sched_scan_config(struct wl1271 *wl,
|
|
struct cfg80211_sched_scan_request *req,
|
|
struct ieee80211_sched_scan_ies *ies);
|
|
int wl1271_scan_sched_scan_start(struct wl1271 *wl);
|
|
void wl1271_scan_sched_scan_stop(struct wl1271 *wl);
|
|
void wl1271_scan_sched_scan_results(struct wl1271 *wl);
|
|
|
|
#define WL1271_SCAN_MAX_CHANNELS 24
|
|
#define WL1271_SCAN_DEFAULT_TAG 1
|
|
#define WL1271_SCAN_CURRENT_TX_PWR 0
|
|
#define WL1271_SCAN_OPT_ACTIVE 0
|
|
#define WL1271_SCAN_OPT_PASSIVE 1
|
|
#define WL1271_SCAN_OPT_PRIORITY_HIGH 4
|
|
#define WL1271_SCAN_BAND_2_4_GHZ 0
|
|
#define WL1271_SCAN_BAND_5_GHZ 1
|
|
|
|
#define WL1271_SCAN_TIMEOUT 10000 /* msec */
|
|
|
|
enum {
|
|
WL1271_SCAN_STATE_IDLE,
|
|
WL1271_SCAN_STATE_2GHZ_ACTIVE,
|
|
WL1271_SCAN_STATE_2GHZ_PASSIVE,
|
|
WL1271_SCAN_STATE_5GHZ_ACTIVE,
|
|
WL1271_SCAN_STATE_5GHZ_PASSIVE,
|
|
WL1271_SCAN_STATE_DONE
|
|
};
|
|
|
|
struct basic_scan_params {
|
|
__le32 rx_config_options;
|
|
__le32 rx_filter_options;
|
|
/* Scan option flags (WL1271_SCAN_OPT_*) */
|
|
__le16 scan_options;
|
|
/* Number of scan channels in the list (maximum 30) */
|
|
u8 n_ch;
|
|
/* This field indicates the number of probe requests to send
|
|
per channel for an active scan */
|
|
u8 n_probe_reqs;
|
|
/* Rate bit field for sending the probes */
|
|
__le32 tx_rate;
|
|
u8 tid_trigger;
|
|
u8 ssid_len;
|
|
/* in order to align */
|
|
u8 padding1[2];
|
|
u8 ssid[IW_ESSID_MAX_SIZE];
|
|
/* Band to scan */
|
|
u8 band;
|
|
u8 use_ssid_list;
|
|
u8 scan_tag;
|
|
u8 padding2;
|
|
} __packed;
|
|
|
|
struct basic_scan_channel_params {
|
|
/* Duration in TU to wait for frames on a channel for active scan */
|
|
__le32 min_duration;
|
|
__le32 max_duration;
|
|
__le32 bssid_lsb;
|
|
__le16 bssid_msb;
|
|
u8 early_termination;
|
|
u8 tx_power_att;
|
|
u8 channel;
|
|
/* FW internal use only! */
|
|
u8 dfs_candidate;
|
|
u8 activity_detected;
|
|
u8 pad;
|
|
} __packed;
|
|
|
|
struct wl1271_cmd_scan {
|
|
struct wl1271_cmd_header header;
|
|
|
|
struct basic_scan_params params;
|
|
struct basic_scan_channel_params channels[WL1271_SCAN_MAX_CHANNELS];
|
|
} __packed;
|
|
|
|
struct wl1271_cmd_trigger_scan_to {
|
|
struct wl1271_cmd_header header;
|
|
|
|
__le32 timeout;
|
|
} __packed;
|
|
|
|
#define MAX_CHANNELS_ALL_BANDS 41
|
|
#define SCAN_MAX_CYCLE_INTERVALS 16
|
|
#define SCAN_MAX_BANDS 3
|
|
|
|
enum {
|
|
SCAN_CHANNEL_TYPE_2GHZ_PASSIVE,
|
|
SCAN_CHANNEL_TYPE_2GHZ_ACTIVE,
|
|
SCAN_CHANNEL_TYPE_5GHZ_PASSIVE,
|
|
SCAN_CHANNEL_TYPE_5GHZ_ACTIVE,
|
|
SCAN_CHANNEL_TYPE_5GHZ_DFS,
|
|
};
|
|
|
|
enum {
|
|
SCAN_SSID_FILTER_ANY = 0,
|
|
SCAN_SSID_FILTER_SPECIFIC = 1,
|
|
SCAN_SSID_FILTER_LIST = 2,
|
|
SCAN_SSID_FILTER_DISABLED = 3
|
|
};
|
|
|
|
enum {
|
|
SCAN_BSS_TYPE_INDEPENDENT,
|
|
SCAN_BSS_TYPE_INFRASTRUCTURE,
|
|
SCAN_BSS_TYPE_ANY,
|
|
};
|
|
|
|
#define SCAN_CHANNEL_FLAGS_DFS BIT(0)
|
|
#define SCAN_CHANNEL_FLAGS_DFS_ENABLED BIT(1)
|
|
|
|
struct conn_scan_ch_params {
|
|
__le16 min_duration;
|
|
__le16 max_duration;
|
|
__le16 passive_duration;
|
|
|
|
u8 channel;
|
|
u8 tx_power_att;
|
|
|
|
/* bit 0: DFS channel; bit 1: DFS enabled */
|
|
u8 flags;
|
|
|
|
u8 padding[3];
|
|
} __packed;
|
|
|
|
struct wl1271_cmd_sched_scan_config {
|
|
struct wl1271_cmd_header header;
|
|
|
|
__le32 intervals[SCAN_MAX_CYCLE_INTERVALS];
|
|
|
|
s8 rssi_threshold; /* for filtering (in dBm) */
|
|
s8 snr_threshold; /* for filtering (in dB) */
|
|
|
|
u8 cycles; /* maximum number of scan cycles */
|
|
u8 report_after; /* report when this number of results are received */
|
|
u8 terminate; /* stop scanning after reporting */
|
|
|
|
u8 tag;
|
|
u8 bss_type; /* for filtering */
|
|
u8 filter_type;
|
|
|
|
u8 ssid_len; /* For SCAN_SSID_FILTER_SPECIFIC */
|
|
u8 ssid[IW_ESSID_MAX_SIZE];
|
|
|
|
u8 n_probe_reqs; /* Number of probes requests per channel */
|
|
|
|
u8 passive[SCAN_MAX_BANDS];
|
|
u8 active[SCAN_MAX_BANDS];
|
|
|
|
u8 dfs;
|
|
|
|
u8 padding[3];
|
|
|
|
struct conn_scan_ch_params channels[MAX_CHANNELS_ALL_BANDS];
|
|
} __packed;
|
|
|
|
|
|
#define SCHED_SCAN_MAX_SSIDS 8
|
|
|
|
enum {
|
|
SCAN_SSID_TYPE_PUBLIC = 0,
|
|
SCAN_SSID_TYPE_HIDDEN = 1,
|
|
};
|
|
|
|
struct wl1271_ssid {
|
|
u8 type;
|
|
u8 len;
|
|
u8 ssid[IW_ESSID_MAX_SIZE];
|
|
/* u8 padding[2]; */
|
|
} __packed;
|
|
|
|
struct wl1271_cmd_sched_scan_ssid_list {
|
|
struct wl1271_cmd_header header;
|
|
|
|
u8 n_ssids;
|
|
struct wl1271_ssid ssids[SCHED_SCAN_MAX_SSIDS];
|
|
u8 padding[3];
|
|
} __packed;
|
|
|
|
struct wl1271_cmd_sched_scan_start {
|
|
struct wl1271_cmd_header header;
|
|
|
|
u8 tag;
|
|
u8 padding[3];
|
|
} __packed;
|
|
|
|
struct wl1271_cmd_sched_scan_stop {
|
|
struct wl1271_cmd_header header;
|
|
|
|
u8 tag;
|
|
u8 padding[3];
|
|
} __packed;
|
|
|
|
|
|
#endif /* __WL1271_SCAN_H__ */
|