aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-03-31 12:12:05 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-04-22 16:54:39 -0400
commit18a8365992a8041aa178ae9ad5f0d951d0457230 (patch)
treecb7a461139269feb191e5f5d03c4438cfa9335f2 /include
parent75c2148fa5330c6de741fc96e3308f57d846a6b4 (diff)
downloadmrst-s0i3-test-18a8365992a8041aa178ae9ad5f0d951d0457230.tar.gz
mrst-s0i3-test-18a8365992a8041aa178ae9ad5f0d951d0457230.tar.xz
mrst-s0i3-test-18a8365992a8041aa178ae9ad5f0d951d0457230.zip
cfg80211: introduce scan IE limit attribute
This patch introduces a new attribute for a wiphy that tells userspace how long the information elements added to a probe request frame can be at most. It also updates the at76 to advertise that it cannot support that, and, for now until I can fix that, iwlwifi too. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/nl80211.h4
-rw-r--r--include/net/wireless.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 27f230f063b..209cacee528 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -390,6 +390,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_SCAN_IE_LEN: maximum length of information elements
+ * that can be added to a scan request
*
* @NL80211_ATTR_SCAN_FREQUENCIES: nested attribute with frequencies (in MHz)
* @NL80211_ATTR_SCAN_SSIDS: nested attribute with SSIDs, leave out for passive
@@ -507,6 +509,8 @@ enum nl80211_attrs {
NL80211_ATTR_KEY_TYPE,
+ NL80211_ATTR_MAX_SCAN_IE_LEN,
+
/* add attributes here, update the policy in nl80211.c */
__NL80211_ATTR_AFTER_LAST,
diff --git a/include/net/wireless.h b/include/net/wireless.h
index 64a76208580..2bcdeda46d8 100644
--- a/include/net/wireless.h
+++ b/include/net/wireless.h
@@ -222,6 +222,7 @@ struct wiphy {
int bss_priv_size;
u8 max_scan_ssids;
+ u16 max_scan_ie_len;
/* If multiple wiphys are registered and you're handed e.g.
* a regular netdev with assigned ieee80211_ptr, you won't