cfg80211/nl80211: add interval attribute for scheduled scans
Introduce NL80211_ATTR_SCHED_SCAN_INTERVAL as a required attribute for NL80211_CMD_START_SCHED_SCAN. This value informs the driver at which intervals the scheduled scan cycles should be executed. Signed-off-by: Luciano Coelho <coelho@ti.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
79f460ca49
commit
bbe6ad6dcb
|
@ -203,15 +203,17 @@
|
|||
* @NL80211_CMD_SCAN_ABORTED: scan was aborted, for unspecified reasons,
|
||||
* partial scan results may be available
|
||||
*
|
||||
* @NL80211_CMD_START_SCHED_SCAN: start a scheduled scan. Like with normal
|
||||
* scans, if SSIDs (%NL80211_ATTR_SCAN_SSIDS) are passed, they are used
|
||||
* in the probe requests. For broadcast, a broadcast SSID must be
|
||||
* passed (ie. an empty string). If no SSID is passed, no probe
|
||||
* requests are sent and a passive scan is performed.
|
||||
* %NL80211_ATTR_SCAN_FREQUENCIES, if passed, define which channels
|
||||
* should be scanned; if not passed, all channels allowed for the
|
||||
* current regulatory domain are used. Extra IEs can also be passed
|
||||
* from the userspace by using the %NL80211_ATTR_IE attribute.
|
||||
* @NL80211_CMD_START_SCHED_SCAN: start a scheduled scan at certain
|
||||
* intervals, as specified by %NL80211_ATTR_SCHED_SCAN_INTERVAL.
|
||||
* Like with normal scans, if SSIDs (%NL80211_ATTR_SCAN_SSIDS)
|
||||
* are passed, they are used in the probe requests. For
|
||||
* broadcast, a broadcast SSID must be passed (ie. an empty
|
||||
* string). If no SSID is passed, no probe requests are sent and
|
||||
* a passive scan is performed. %NL80211_ATTR_SCAN_FREQUENCIES,
|
||||
* if passed, define which channels should be scanned; if not
|
||||
* passed, all channels allowed for the current regulatory domain
|
||||
* are used. Extra IEs can also be passed from the userspace by
|
||||
* using the %NL80211_ATTR_IE attribute.
|
||||
* @NL80211_CMD_STOP_SCHED_SCAN: stop a scheduled scan
|
||||
* @NL80211_CMD_SCHED_SCAN_RESULTS: indicates that there are scheduled scan
|
||||
* results available.
|
||||
|
@ -948,6 +950,9 @@ enum nl80211_commands {
|
|||
* indicate which WoW triggers should be enabled. This is also
|
||||
* used by %NL80211_CMD_GET_WOWLAN to get the currently enabled WoWLAN
|
||||
* triggers.
|
||||
|
||||
* @NL80211_ATTR_SCHED_SCAN_INTERVAL: Interval between scheduled scan
|
||||
* cycles, in msecs.
|
||||
*
|
||||
* @NL80211_ATTR_MAX: highest attribute number currently defined
|
||||
* @__NL80211_ATTR_AFTER_LAST: internal use
|
||||
|
@ -1142,6 +1147,8 @@ enum nl80211_attrs {
|
|||
NL80211_ATTR_WOWLAN_TRIGGERS,
|
||||
NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED,
|
||||
|
||||
NL80211_ATTR_SCHED_SCAN_INTERVAL,
|
||||
|
||||
/* add attributes here, update the policy in nl80211.c */
|
||||
|
||||
__NL80211_ATTR_AFTER_LAST,
|
||||
|
|
|
@ -829,6 +829,7 @@ struct cfg80211_scan_request {
|
|||
* @ssids: SSIDs to scan for (passed in the probe_reqs in active scans)
|
||||
* @n_ssids: number of SSIDs
|
||||
* @n_channels: total number of channels to scan
|
||||
* @interval: interval between each scheduled scan cycle
|
||||
* @ie: optional information element(s) to add into Probe Request or %NULL
|
||||
* @ie_len: length of ie in octets
|
||||
* @wiphy: the wiphy this was for
|
||||
|
@ -839,6 +840,7 @@ struct cfg80211_sched_scan_request {
|
|||
struct cfg80211_ssid *ssids;
|
||||
int n_ssids;
|
||||
u32 n_channels;
|
||||
u32 interval;
|
||||
const u8 *ie;
|
||||
size_t ie_len;
|
||||
|
||||
|
|
|
@ -175,6 +175,7 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
|
|||
[NL80211_ATTR_KEY_DEFAULT_TYPES] = { .type = NLA_NESTED },
|
||||
[NL80211_ATTR_WOWLAN_TRIGGERS] = { .type = NLA_NESTED },
|
||||
[NL80211_ATTR_STA_PLINK_STATE] = { .type = NLA_U8 },
|
||||
[NL80211_ATTR_SCHED_SCAN_INTERVAL] = { .type = NLA_U32 },
|
||||
};
|
||||
|
||||
/* policy for the key attributes */
|
||||
|
@ -3370,6 +3371,7 @@ static int nl80211_start_sched_scan(struct sk_buff *skb,
|
|||
struct nlattr *attr;
|
||||
struct wiphy *wiphy;
|
||||
int err, tmp, n_ssids = 0, n_channels, i;
|
||||
u32 interval;
|
||||
enum ieee80211_band band;
|
||||
size_t ie_len;
|
||||
|
||||
|
@ -3383,6 +3385,13 @@ static int nl80211_start_sched_scan(struct sk_buff *skb,
|
|||
if (rdev->sched_scan_req)
|
||||
return -EINPROGRESS;
|
||||
|
||||
if (!info->attrs[NL80211_ATTR_SCHED_SCAN_INTERVAL])
|
||||
return -EINVAL;
|
||||
|
||||
interval = nla_get_u32(info->attrs[NL80211_ATTR_SCHED_SCAN_INTERVAL]);
|
||||
if (interval == 0)
|
||||
return -EINVAL;
|
||||
|
||||
wiphy = &rdev->wiphy;
|
||||
|
||||
if (info->attrs[NL80211_ATTR_SCAN_FREQUENCIES]) {
|
||||
|
@ -3505,6 +3514,7 @@ static int nl80211_start_sched_scan(struct sk_buff *skb,
|
|||
|
||||
request->dev = dev;
|
||||
request->wiphy = &rdev->wiphy;
|
||||
request->interval = interval;
|
||||
|
||||
err = rdev->ops->sched_scan_start(&rdev->wiphy, dev, request);
|
||||
if (!err) {
|
||||
|
|
Loading…
Reference in a new issue