|
|
@@ -547,6 +547,61 @@ mwifiex_scan_create_channel_list(struct mwifiex_private *priv,
|
|
|
return chan_idx;
|
|
|
}
|
|
|
|
|
|
+/* This function creates a channel list tlv for bgscan config, based
|
|
|
+ * on region/band information.
|
|
|
+ */
|
|
|
+static int
|
|
|
+mwifiex_bgscan_create_channel_list(struct mwifiex_private *priv,
|
|
|
+ const struct mwifiex_bg_scan_cfg
|
|
|
+ *bgscan_cfg_in,
|
|
|
+ struct mwifiex_chan_scan_param_set
|
|
|
+ *scan_chan_list)
|
|
|
+{
|
|
|
+ enum ieee80211_band band;
|
|
|
+ struct ieee80211_supported_band *sband;
|
|
|
+ struct ieee80211_channel *ch;
|
|
|
+ struct mwifiex_adapter *adapter = priv->adapter;
|
|
|
+ int chan_idx = 0, i;
|
|
|
+
|
|
|
+ for (band = 0; (band < IEEE80211_NUM_BANDS); band++) {
|
|
|
+ if (!priv->wdev.wiphy->bands[band])
|
|
|
+ continue;
|
|
|
+
|
|
|
+ sband = priv->wdev.wiphy->bands[band];
|
|
|
+
|
|
|
+ for (i = 0; (i < sband->n_channels) ; i++) {
|
|
|
+ ch = &sband->channels[i];
|
|
|
+ if (ch->flags & IEEE80211_CHAN_DISABLED)
|
|
|
+ continue;
|
|
|
+ scan_chan_list[chan_idx].radio_type = band;
|
|
|
+
|
|
|
+ if (bgscan_cfg_in->chan_list[0].scan_time)
|
|
|
+ scan_chan_list[chan_idx].max_scan_time =
|
|
|
+ cpu_to_le16((u16)bgscan_cfg_in->
|
|
|
+ chan_list[0].scan_time);
|
|
|
+ else if (ch->flags & IEEE80211_CHAN_NO_IR)
|
|
|
+ scan_chan_list[chan_idx].max_scan_time =
|
|
|
+ cpu_to_le16(adapter->passive_scan_time);
|
|
|
+ else
|
|
|
+ scan_chan_list[chan_idx].max_scan_time =
|
|
|
+ cpu_to_le16(adapter->
|
|
|
+ specific_scan_time);
|
|
|
+
|
|
|
+ if (ch->flags & IEEE80211_CHAN_NO_IR)
|
|
|
+ scan_chan_list[chan_idx].chan_scan_mode_bitmap
|
|
|
+ |= MWIFIEX_PASSIVE_SCAN;
|
|
|
+ else
|
|
|
+ scan_chan_list[chan_idx].chan_scan_mode_bitmap
|
|
|
+ &= ~MWIFIEX_PASSIVE_SCAN;
|
|
|
+
|
|
|
+ scan_chan_list[chan_idx].chan_number =
|
|
|
+ (u32)ch->hw_value;
|
|
|
+ chan_idx++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return chan_idx;
|
|
|
+}
|
|
|
+
|
|
|
/* This function appends rate TLV to scan config command. */
|
|
|
static int
|
|
|
mwifiex_append_rate_tlv(struct mwifiex_private *priv,
|
|
|
@@ -2155,6 +2210,212 @@ int mwifiex_cmd_802_11_scan_ext(struct mwifiex_private *priv,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+/* This function prepares an background scan config command to be sent
|
|
|
+ * to the firmware
|
|
|
+ */
|
|
|
+int mwifiex_cmd_802_11_bg_scan_config(struct mwifiex_private *priv,
|
|
|
+ struct host_cmd_ds_command *cmd,
|
|
|
+ void *data_buf)
|
|
|
+{
|
|
|
+ struct host_cmd_ds_802_11_bg_scan_config *bgscan_config =
|
|
|
+ &cmd->params.bg_scan_config;
|
|
|
+ struct mwifiex_bg_scan_cfg *bgscan_cfg_in = data_buf;
|
|
|
+ u8 *tlv_pos = bgscan_config->tlv;
|
|
|
+ u8 num_probes;
|
|
|
+ u32 ssid_len, chan_idx, scan_type, scan_dur, chan_num;
|
|
|
+ int i;
|
|
|
+ struct mwifiex_ie_types_num_probes *num_probes_tlv;
|
|
|
+ struct mwifiex_ie_types_repeat_count *repeat_count_tlv;
|
|
|
+ struct mwifiex_ie_types_bgscan_start_later *start_later_tlv;
|
|
|
+ struct mwifiex_ie_types_wildcard_ssid_params *wildcard_ssid_tlv;
|
|
|
+ struct mwifiex_ie_types_chan_list_param_set *chan_list_tlv;
|
|
|
+ struct mwifiex_chan_scan_param_set *temp_chan;
|
|
|
+
|
|
|
+ cmd->command = cpu_to_le16(HostCmd_CMD_802_11_BG_SCAN_CONFIG);
|
|
|
+ cmd->size = cpu_to_le16(sizeof(*bgscan_config) + S_DS_GEN);
|
|
|
+
|
|
|
+ bgscan_config->action = cpu_to_le16(bgscan_cfg_in->action);
|
|
|
+ bgscan_config->enable = bgscan_cfg_in->enable;
|
|
|
+ bgscan_config->bss_type = bgscan_cfg_in->bss_type;
|
|
|
+ bgscan_config->scan_interval =
|
|
|
+ cpu_to_le32(bgscan_cfg_in->scan_interval);
|
|
|
+ bgscan_config->report_condition =
|
|
|
+ cpu_to_le32(bgscan_cfg_in->report_condition);
|
|
|
+
|
|
|
+ /* stop sched scan */
|
|
|
+ if (!bgscan_config->enable)
|
|
|
+ return 0;
|
|
|
+
|
|
|
+ bgscan_config->chan_per_scan = bgscan_cfg_in->chan_per_scan;
|
|
|
+
|
|
|
+ num_probes = (bgscan_cfg_in->num_probes ? bgscan_cfg_in->
|
|
|
+ num_probes : priv->adapter->scan_probes);
|
|
|
+
|
|
|
+ if (num_probes) {
|
|
|
+ num_probes_tlv = (struct mwifiex_ie_types_num_probes *)tlv_pos;
|
|
|
+ num_probes_tlv->header.type = cpu_to_le16(TLV_TYPE_NUMPROBES);
|
|
|
+ num_probes_tlv->header.len =
|
|
|
+ cpu_to_le16(sizeof(num_probes_tlv->num_probes));
|
|
|
+ num_probes_tlv->num_probes = cpu_to_le16((u16)num_probes);
|
|
|
+
|
|
|
+ tlv_pos += sizeof(num_probes_tlv->header) +
|
|
|
+ le16_to_cpu(num_probes_tlv->header.len);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (bgscan_cfg_in->repeat_count) {
|
|
|
+ repeat_count_tlv =
|
|
|
+ (struct mwifiex_ie_types_repeat_count *)tlv_pos;
|
|
|
+ repeat_count_tlv->header.type =
|
|
|
+ cpu_to_le16(TLV_TYPE_REPEAT_COUNT);
|
|
|
+ repeat_count_tlv->header.len =
|
|
|
+ cpu_to_le16(sizeof(repeat_count_tlv->repeat_count));
|
|
|
+ repeat_count_tlv->repeat_count =
|
|
|
+ cpu_to_le16(bgscan_cfg_in->repeat_count);
|
|
|
+
|
|
|
+ tlv_pos += sizeof(repeat_count_tlv->header) +
|
|
|
+ le16_to_cpu(repeat_count_tlv->header.len);
|
|
|
+ }
|
|
|
+
|
|
|
+ for (i = 0; i < bgscan_cfg_in->num_ssids; i++) {
|
|
|
+ ssid_len = bgscan_cfg_in->ssid_list[i].ssid.ssid_len;
|
|
|
+
|
|
|
+ wildcard_ssid_tlv =
|
|
|
+ (struct mwifiex_ie_types_wildcard_ssid_params *)tlv_pos;
|
|
|
+ wildcard_ssid_tlv->header.type =
|
|
|
+ cpu_to_le16(TLV_TYPE_WILDCARDSSID);
|
|
|
+ wildcard_ssid_tlv->header.len = cpu_to_le16(
|
|
|
+ (u16)(ssid_len + sizeof(wildcard_ssid_tlv->
|
|
|
+ max_ssid_length)));
|
|
|
+
|
|
|
+ /* max_ssid_length = 0 tells firmware to perform
|
|
|
+ * specific scan for the SSID filled, whereas
|
|
|
+ * max_ssid_length = IEEE80211_MAX_SSID_LEN is for
|
|
|
+ * wildcard scan.
|
|
|
+ */
|
|
|
+ if (ssid_len)
|
|
|
+ wildcard_ssid_tlv->max_ssid_length = 0;
|
|
|
+ else
|
|
|
+ wildcard_ssid_tlv->max_ssid_length =
|
|
|
+ IEEE80211_MAX_SSID_LEN;
|
|
|
+
|
|
|
+ memcpy(wildcard_ssid_tlv->ssid,
|
|
|
+ bgscan_cfg_in->ssid_list[i].ssid.ssid, ssid_len);
|
|
|
+
|
|
|
+ tlv_pos += (sizeof(wildcard_ssid_tlv->header)
|
|
|
+ + le16_to_cpu(wildcard_ssid_tlv->header.len));
|
|
|
+ }
|
|
|
+
|
|
|
+ chan_list_tlv = (struct mwifiex_ie_types_chan_list_param_set *)tlv_pos;
|
|
|
+
|
|
|
+ if (bgscan_cfg_in->chan_list[0].chan_number) {
|
|
|
+ dev_dbg(priv->adapter->dev, "info: bgscan: Using supplied channel list\n");
|
|
|
+
|
|
|
+ chan_list_tlv->header.type = cpu_to_le16(TLV_TYPE_CHANLIST);
|
|
|
+
|
|
|
+ for (chan_idx = 0;
|
|
|
+ chan_idx < MWIFIEX_BG_SCAN_CHAN_MAX &&
|
|
|
+ bgscan_cfg_in->chan_list[chan_idx].chan_number;
|
|
|
+ chan_idx++) {
|
|
|
+ temp_chan = chan_list_tlv->chan_scan_param + chan_idx;
|
|
|
+
|
|
|
+ /* Increment the TLV header length by size appended */
|
|
|
+ le16_add_cpu(&chan_list_tlv->header.len,
|
|
|
+ sizeof(chan_list_tlv->chan_scan_param));
|
|
|
+
|
|
|
+ temp_chan->chan_number =
|
|
|
+ bgscan_cfg_in->chan_list[chan_idx].chan_number;
|
|
|
+ temp_chan->radio_type =
|
|
|
+ bgscan_cfg_in->chan_list[chan_idx].radio_type;
|
|
|
+
|
|
|
+ scan_type =
|
|
|
+ bgscan_cfg_in->chan_list[chan_idx].scan_type;
|
|
|
+
|
|
|
+ if (scan_type == MWIFIEX_SCAN_TYPE_PASSIVE)
|
|
|
+ temp_chan->chan_scan_mode_bitmap
|
|
|
+ |= MWIFIEX_PASSIVE_SCAN;
|
|
|
+ else
|
|
|
+ temp_chan->chan_scan_mode_bitmap
|
|
|
+ &= ~MWIFIEX_PASSIVE_SCAN;
|
|
|
+
|
|
|
+ if (bgscan_cfg_in->chan_list[chan_idx].scan_time) {
|
|
|
+ scan_dur = (u16)bgscan_cfg_in->
|
|
|
+ chan_list[chan_idx].scan_time;
|
|
|
+ } else {
|
|
|
+ scan_dur = (scan_type ==
|
|
|
+ MWIFIEX_SCAN_TYPE_PASSIVE) ?
|
|
|
+ priv->adapter->passive_scan_time :
|
|
|
+ priv->adapter->specific_scan_time;
|
|
|
+ }
|
|
|
+
|
|
|
+ temp_chan->min_scan_time = cpu_to_le16(scan_dur);
|
|
|
+ temp_chan->max_scan_time = cpu_to_le16(scan_dur);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ dev_dbg(priv->adapter->dev,
|
|
|
+ "info: bgscan: Creating full region channel list\n");
|
|
|
+ chan_num =
|
|
|
+ mwifiex_bgscan_create_channel_list(priv, bgscan_cfg_in,
|
|
|
+ chan_list_tlv->
|
|
|
+ chan_scan_param);
|
|
|
+ le16_add_cpu(&chan_list_tlv->header.len,
|
|
|
+ chan_num *
|
|
|
+ sizeof(chan_list_tlv->chan_scan_param[0]));
|
|
|
+ }
|
|
|
+
|
|
|
+ tlv_pos += (sizeof(chan_list_tlv->header)
|
|
|
+ + le16_to_cpu(chan_list_tlv->header.len));
|
|
|
+
|
|
|
+ if (bgscan_cfg_in->start_later) {
|
|
|
+ start_later_tlv =
|
|
|
+ (struct mwifiex_ie_types_bgscan_start_later *)tlv_pos;
|
|
|
+ start_later_tlv->header.type =
|
|
|
+ cpu_to_le16(TLV_TYPE_BGSCAN_START_LATER);
|
|
|
+ start_later_tlv->header.len =
|
|
|
+ cpu_to_le16(sizeof(start_later_tlv->start_later));
|
|
|
+ start_later_tlv->start_later =
|
|
|
+ cpu_to_le16(bgscan_cfg_in->start_later);
|
|
|
+
|
|
|
+ tlv_pos += sizeof(start_later_tlv->header) +
|
|
|
+ le16_to_cpu(start_later_tlv->header.len);
|
|
|
+ }
|
|
|
+
|
|
|
+ /* Append vendor specific IE TLV */
|
|
|
+ mwifiex_cmd_append_vsie_tlv(priv, MWIFIEX_VSIE_MASK_BGSCAN, &tlv_pos);
|
|
|
+
|
|
|
+ le16_add_cpu(&cmd->size, tlv_pos - bgscan_config->tlv);
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+int mwifiex_stop_bg_scan(struct mwifiex_private *priv)
|
|
|
+{
|
|
|
+ struct mwifiex_bg_scan_cfg *bgscan_cfg;
|
|
|
+
|
|
|
+ if (!priv->sched_scanning) {
|
|
|
+ dev_dbg(priv->adapter->dev, "bgscan already stopped!\n");
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ bgscan_cfg = kzalloc(sizeof(*bgscan_cfg), GFP_KERNEL);
|
|
|
+ if (!bgscan_cfg)
|
|
|
+ return -ENOMEM;
|
|
|
+
|
|
|
+ bgscan_cfg->bss_type = MWIFIEX_BSS_MODE_INFRA;
|
|
|
+ bgscan_cfg->action = MWIFIEX_BGSCAN_ACT_SET;
|
|
|
+ bgscan_cfg->enable = false;
|
|
|
+
|
|
|
+ if (mwifiex_send_cmd(priv, HostCmd_CMD_802_11_BG_SCAN_CONFIG,
|
|
|
+ HostCmd_ACT_GEN_SET, 0, bgscan_cfg, true)) {
|
|
|
+ kfree(bgscan_cfg);
|
|
|
+ return -EFAULT;
|
|
|
+ }
|
|
|
+
|
|
|
+ kfree(bgscan_cfg);
|
|
|
+ priv->sched_scanning = false;
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
static void
|
|
|
mwifiex_update_chan_statistics(struct mwifiex_private *priv,
|
|
|
struct mwifiex_ietypes_chanstats *tlv_stat)
|
Xinming Hu