diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-03-31 06:12:05 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-04-22 16:54:39 -0400 |
commit | 18a8365992a8041aa178ae9ad5f0d951d0457230 (patch) | |
tree | cb7a461139269feb191e5f5d03c4438cfa9335f2 /include | |
parent | 75c2148fa5330c6de741fc96e3308f57d846a6b4 (diff) |
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.h | 4 | ||||
-rw-r--r-- | include/net/wireless.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h index 27f230f063b3..209cacee5285 100644 --- a/include/linux/nl80211.h +++ b/include/linux/nl80211.h | |||
@@ -390,6 +390,8 @@ enum nl80211_commands { | |||
390 | * | 390 | * |
391 | * @NL80211_ATTR_MAX_NUM_SCAN_SSIDS: number of SSIDs you can scan with | 391 | * @NL80211_ATTR_MAX_NUM_SCAN_SSIDS: number of SSIDs you can scan with |
392 | * a single scan request, a wiphy attribute. | 392 | * a single scan request, a wiphy attribute. |
393 | * @NL80211_ATTR_MAX_SCAN_IE_LEN: maximum length of information elements | ||
394 | * that can be added to a scan request | ||
393 | * | 395 | * |
394 | * @NL80211_ATTR_SCAN_FREQUENCIES: nested attribute with frequencies (in MHz) | 396 | * @NL80211_ATTR_SCAN_FREQUENCIES: nested attribute with frequencies (in MHz) |
395 | * @NL80211_ATTR_SCAN_SSIDS: nested attribute with SSIDs, leave out for passive | 397 | * @NL80211_ATTR_SCAN_SSIDS: nested attribute with SSIDs, leave out for passive |
@@ -507,6 +509,8 @@ enum nl80211_attrs { | |||
507 | 509 | ||
508 | NL80211_ATTR_KEY_TYPE, | 510 | NL80211_ATTR_KEY_TYPE, |
509 | 511 | ||
512 | NL80211_ATTR_MAX_SCAN_IE_LEN, | ||
513 | |||
510 | /* add attributes here, update the policy in nl80211.c */ | 514 | /* add attributes here, update the policy in nl80211.c */ |
511 | 515 | ||
512 | __NL80211_ATTR_AFTER_LAST, | 516 | __NL80211_ATTR_AFTER_LAST, |
diff --git a/include/net/wireless.h b/include/net/wireless.h index 64a76208580c..2bcdeda46d81 100644 --- a/include/net/wireless.h +++ b/include/net/wireless.h | |||
@@ -222,6 +222,7 @@ struct wiphy { | |||
222 | 222 | ||
223 | int bss_priv_size; | 223 | int bss_priv_size; |
224 | u8 max_scan_ssids; | 224 | u8 max_scan_ssids; |
225 | u16 max_scan_ie_len; | ||
225 | 226 | ||
226 | /* If multiple wiphys are registered and you're handed e.g. | 227 | /* If multiple wiphys are registered and you're handed e.g. |
227 | * a regular netdev with assigned ieee80211_ptr, you won't | 228 | * a regular netdev with assigned ieee80211_ptr, you won't |