aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless/nl80211.c
diff options
context:
space:
mode:
authorLuciano Coelho <coelho@ti.com>2011-07-13 07:57:29 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-07-15 13:38:30 -0400
commit5a865bad44984de245d20bfb7cff99993e8e8294 (patch)
treef4a73c454eddd082e397d53a8467e4a92fd28ee3 /net/wireless/nl80211.c
parent93b6aa693a355932b69c96956596b03f91baec35 (diff)
nl80211/cfg80211: add max_sched_scan_ie_len in the hw description
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>
Diffstat (limited to 'net/wireless/nl80211.c')
-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 935b58b7caf9..44a3fc2ce38d 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -700,6 +700,8 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
700 dev->wiphy.max_sched_scan_ssids); 700 dev->wiphy.max_sched_scan_ssids);
701 NLA_PUT_U16(msg, NL80211_ATTR_MAX_SCAN_IE_LEN, 701 NLA_PUT_U16(msg, NL80211_ATTR_MAX_SCAN_IE_LEN,
702 dev->wiphy.max_scan_ie_len); 702 dev->wiphy.max_scan_ie_len);
703 NLA_PUT_U16(msg, NL80211_ATTR_MAX_SCHED_SCAN_IE_LEN,
704 dev->wiphy.max_sched_scan_ie_len);
703 705
704 if (dev->wiphy.flags & WIPHY_FLAG_IBSS_RSN) 706 if (dev->wiphy.flags & WIPHY_FLAG_IBSS_RSN)
705 NLA_PUT_FLAG(msg, NL80211_ATTR_SUPPORT_IBSS_RSN); 707 NLA_PUT_FLAG(msg, NL80211_ATTR_SUPPORT_IBSS_RSN);
@@ -3521,7 +3523,7 @@ static int nl80211_start_sched_scan(struct sk_buff *skb,
3521 else 3523 else
3522 ie_len = 0; 3524 ie_len = 0;
3523 3525
3524 if (ie_len > wiphy->max_scan_ie_len) 3526 if (ie_len > wiphy->max_sched_scan_ie_len)
3525 return -EINVAL; 3527 return -EINVAL;
3526 3528
3527 mutex_lock(&rdev->sched_scan_mtx); 3529 mutex_lock(&rdev->sched_scan_mtx);