Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93b6aa69 authored Jul 13, 2011 by Luciano Coelho Committed by John W. Linville Jul 15, 2011

nl80211/cfg80211: add max_sched_scan_ssids in the hw description



Some chips can scan more SSIDs with a single scheduled scan command
than with a single normal scan command (eg. wl12xx chips).

To support this, this patch creates a separate hardware description
element that describes the amount of SSIDs supported in scheduled
scans.

Signed-off-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 77dbbb13

include/linux/nl80211.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -756,6 +756,8 @@ enum nl80211_commands {
		*
		* @NL80211_ATTR_MAX_NUM_SCAN_SSIDS: number of SSIDs you can scan with
		* a single scan request, a wiphy attribute.
		* @NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS: number of SSIDs you can
		* scan with a single scheduled scan request, a wiphy attribute.
		* @NL80211_ATTR_MAX_SCAN_IE_LEN: maximum length of information elements
		* that can be added to a scan request
		*
		@@ -1210,6 +1212,8 @@ enum nl80211_attrs {

		NL80211_ATTR_REKEY_DATA,

		NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS,

		/* add attributes here, update the policy in nl80211.c */

		__NL80211_ATTR_AFTER_LAST,

include/net/cfg80211.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -1758,6 +1758,8 @@ struct wiphy_wowlan_support {
		* this variable determines its size
		* @max_scan_ssids: maximum number of SSIDs the device can scan for in
		* any given scan
		* @max_sched_scan_ssids: maximum number of SSIDs the device can scan
		* for in any given scheduled scan
		* @max_scan_ie_len: maximum length of user-controlled IEs device can
		* add to probe request frames transmitted during a scan, must not
		* include fixed IEs like supported rates
		@@ -1812,6 +1814,7 @@ struct wiphy {

		int bss_priv_size;
		u8 max_scan_ssids;
		u8 max_sched_scan_ssids;
		u16 max_scan_ie_len;

		int n_cipher_suites;

net/wireless/nl80211.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -696,6 +696,8 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
		dev->wiphy.coverage_class);
		NLA_PUT_U8(msg, NL80211_ATTR_MAX_NUM_SCAN_SSIDS,
		dev->wiphy.max_scan_ssids);
		NLA_PUT_U8(msg, NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS,
		dev->wiphy.max_sched_scan_ssids);
		NLA_PUT_U16(msg, NL80211_ATTR_MAX_SCAN_IE_LEN,
		dev->wiphy.max_scan_ie_len);

		@@ -3511,7 +3513,7 @@ static int nl80211_start_sched_scan(struct sk_buff *skb,
		tmp)
		n_ssids++;

		if (n_ssids > wiphy->max_scan_ssids)
		if (n_ssids > wiphy->max_sched_scan_ssids)
		return -EINVAL;

		if (info->attrs[NL80211_ATTR_IE])