iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nl80211/cfg80211: add max_sched_scan_ie_len in the hw description

Browse Source 
Some chips may support different lengths of user-supplied IEs with a
single scheduled scan command than with a single normal scan command.

To support this, this patch creates a separate hardware description
element that describes the maximum size of user-supplied information
element data supported in scheduled scans.

Signed-off-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Luciano Coelho 2011-07-13 14:57:29 +03:00 committed by John W. Linville
parent 93b6aa693a
commit 5a865bad44
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/nl80211.h
View File

@ -760,6 +760,8 @@ enum nl80211_commands {
* scan with a single scheduled scan request, a wiphy attribute. * scan with a single scheduled scan request, a wiphy attribute.
* @NL80211_ATTR_MAX_SCAN_IE_LEN: maximum length of information elements * @NL80211_ATTR_MAX_SCAN_IE_LEN: maximum length of information elements
* that can be added to a scan request * that can be added to a scan request
* @NL80211_ATTR_MAX_SCHED_SCAN_IE_LEN: maximum length of information
* elements that can be added to a scheduled scan request
* *
* @NL80211_ATTR_SCAN_FREQUENCIES: nested attribute with frequencies (in MHz) * @NL80211_ATTR_SCAN_FREQUENCIES: nested attribute with frequencies (in MHz)
* @NL80211_ATTR_SCAN_SSIDS: nested attribute with SSIDs, leave out for passive * @NL80211_ATTR_SCAN_SSIDS: nested attribute with SSIDs, leave out for passive
@ -1213,6 +1215,7 @@ enum nl80211_attrs {
NL80211_ATTR_REKEY_DATA, NL80211_ATTR_REKEY_DATA,
NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS, NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS,
NL80211_ATTR_MAX_SCHED_SCAN_IE_LEN,
/* add attributes here, update the policy in nl80211.c */ /* add attributes here, update the policy in nl80211.c */

3
include/net/cfg80211.h
View File

@ -1763,6 +1763,8 @@ struct wiphy_wowlan_support {
* @max_scan_ie_len: maximum length of user-controlled IEs device can * @max_scan_ie_len: maximum length of user-controlled IEs device can
* add to probe request frames transmitted during a scan, must not * add to probe request frames transmitted during a scan, must not
* include fixed IEs like supported rates * include fixed IEs like supported rates
* @max_sched_scan_ie_len: same as max_scan_ie_len, but for scheduled
* scans
* @coverage_class: current coverage class * @coverage_class: current coverage class
* @fw_version: firmware version for ethtool reporting * @fw_version: firmware version for ethtool reporting
* @hw_version: hardware version for ethtool reporting * @hw_version: hardware version for ethtool reporting
@ -1816,6 +1818,7 @@ struct wiphy {
u8 max_scan_ssids; u8 max_scan_ssids;
u8 max_sched_scan_ssids; u8 max_sched_scan_ssids;
u16 max_scan_ie_len; u16 max_scan_ie_len;
u16 max_sched_scan_ie_len;
int n_cipher_suites; int n_cipher_suites;
const u32 *cipher_suites; const u32 *cipher_suites;

4
net/wireless/nl80211.c
View File

@ -700,6 +700,8 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
dev->wiphy.max_sched_scan_ssids); dev->wiphy.max_sched_scan_ssids);
NLA_PUT_U16(msg, NL80211_ATTR_MAX_SCAN_IE_LEN, NLA_PUT_U16(msg, NL80211_ATTR_MAX_SCAN_IE_LEN,
dev->wiphy.max_scan_ie_len); dev->wiphy.max_scan_ie_len);
NLA_PUT_U16(msg, NL80211_ATTR_MAX_SCHED_SCAN_IE_LEN,
dev->wiphy.max_sched_scan_ie_len);
if (dev->wiphy.flags & WIPHY_FLAG_IBSS_RSN) if (dev->wiphy.flags & WIPHY_FLAG_IBSS_RSN)
NLA_PUT_FLAG(msg, NL80211_ATTR_SUPPORT_IBSS_RSN); NLA_PUT_FLAG(msg, NL80211_ATTR_SUPPORT_IBSS_RSN);
@ -3521,7 +3523,7 @@ static int nl80211_start_sched_scan(struct sk_buff *skb,
else else
ie_len = 0; ie_len = 0;
if (ie_len > wiphy->max_scan_ie_len) if (ie_len > wiphy->max_sched_scan_ie_len)
return -EINVAL; return -EINVAL;
mutex_lock(&rdev->sched_scan_mtx); mutex_lock(&rdev->sched_scan_mtx);