aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorLuciano Coelho <coelho@ti.com>2011-07-13 07:57:28 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-07-15 13:38:29 -0400
commit93b6aa693a355932b69c96956596b03f91baec35 (patch)
tree882cf301349f62c68fcd4df765447cbb969ef67a /net/wireless
parent77dbbb138986b26cb99f868d4b6410577ef4c040 (diff)
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>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/nl80211.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index a2e1e49c9196..935b58b7caf9 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -696,6 +696,8 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
696 dev->wiphy.coverage_class); 696 dev->wiphy.coverage_class);
697 NLA_PUT_U8(msg, NL80211_ATTR_MAX_NUM_SCAN_SSIDS, 697 NLA_PUT_U8(msg, NL80211_ATTR_MAX_NUM_SCAN_SSIDS,
698 dev->wiphy.max_scan_ssids); 698 dev->wiphy.max_scan_ssids);
699 NLA_PUT_U8(msg, NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS,
700 dev->wiphy.max_sched_scan_ssids);
699 NLA_PUT_U16(msg, NL80211_ATTR_MAX_SCAN_IE_LEN, 701 NLA_PUT_U16(msg, NL80211_ATTR_MAX_SCAN_IE_LEN,
700 dev->wiphy.max_scan_ie_len); 702 dev->wiphy.max_scan_ie_len);
701 703
@@ -3511,7 +3513,7 @@ static int nl80211_start_sched_scan(struct sk_buff *skb,
3511 tmp) 3513 tmp)
3512 n_ssids++; 3514 n_ssids++;
3513 3515
3514 if (n_ssids > wiphy->max_scan_ssids) 3516 if (n_ssids > wiphy->max_sched_scan_ssids)
3515 return -EINVAL; 3517 return -EINVAL;
3516 3518
3517 if (info->attrs[NL80211_ATTR_IE]) 3519 if (info->attrs[NL80211_ATTR_IE])