diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-04-01 05:58:36 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-04-22 16:54:39 -0400 |
commit | de95a54b1aebe5592cae971ca5e5d9ec6a381a17 (patch) | |
tree | 55a622d1e61e73cd6426c5e0643ac9fd117a9fe8 /include/net/mac80211.h | |
parent | 18a8365992a8041aa178ae9ad5f0d951d0457230 (diff) |
mac80211: pass all probe request IEs to driver
Instead of just passing the cfg80211-requested IEs, pass
the locally generated ones as well.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r-- | include/net/mac80211.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 3b83a80e3fe0..2c6f976831b5 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -1330,11 +1330,14 @@ enum ieee80211_ampdu_mlme_action { | |||
1330 | * the scan state machine in stack. The scan must honour the channel | 1330 | * the scan state machine in stack. The scan must honour the channel |
1331 | * configuration done by the regulatory agent in the wiphy's | 1331 | * configuration done by the regulatory agent in the wiphy's |
1332 | * registered bands. The hardware (or the driver) needs to make sure | 1332 | * registered bands. The hardware (or the driver) needs to make sure |
1333 | * that power save is disabled. When the scan finishes, | 1333 | * that power save is disabled. |
1334 | * ieee80211_scan_completed() must be called; note that it also must | 1334 | * The @req ie/ie_len members are rewritten by mac80211 to contain the |
1335 | * be called when the scan cannot finish because the hardware is | 1335 | * entire IEs after the SSID, so that drivers need not look at these |
1336 | * turned off! Anything else is a bug! Returns a negative error code | 1336 | * at all but just send them after the SSID -- mac80211 includes the |
1337 | * which will be seen in userspace. | 1337 | * (extended) supported rates and HT information (where applicable). |
1338 | * When the scan finishes, ieee80211_scan_completed() must be called; | ||
1339 | * note that it also must be called when the scan cannot finish due to | ||
1340 | * any error unless this callback returned a negative error code. | ||
1338 | * | 1341 | * |
1339 | * @sw_scan_start: Notifier function that is called just before a software scan | 1342 | * @sw_scan_start: Notifier function that is called just before a software scan |
1340 | * is started. Can be NULL, if the driver doesn't need this notification. | 1343 | * is started. Can be NULL, if the driver doesn't need this notification. |