summaryrefslogtreecommitdiff
path: root/net/mac80211/scan.c
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2009-02-16 19:39:13 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-02-27 14:52:38 -0500
commit70692ad2923a379e0a10f9ec2ad93fbbe084cc46 (patch)
treef67488c396ea6e61f71e0199eea189ea939a698b /net/mac80211/scan.c
parent83befbde839b1deb0cd752a834ffd9fde8571ae2 (diff)
downloadlinux-3.10-70692ad2923a379e0a10f9ec2ad93fbbe084cc46.tar.gz
linux-3.10-70692ad2923a379e0a10f9ec2ad93fbbe084cc46.tar.bz2
linux-3.10-70692ad2923a379e0a10f9ec2ad93fbbe084cc46.zip
nl80211: Optional IEs into scan request
This extends the NL80211_CMD_TRIGGER_SCAN command to allow applications to specify a set of information element(s) to be added into Probe Request frames with NL80211_ATTR_IE. This provides support for the MLME-SCAN.request primitive parameter VendorSpecificInfo and can be used, e.g., to implement WPS scanning. Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/scan.c')
-rw-r--r--net/mac80211/scan.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 08a1fc27ca1..c063f820426 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -338,7 +338,8 @@ void ieee80211_scan_work(struct work_struct *work)
ieee80211_send_probe_req(
sdata, NULL,
local->scan_req->ssids[i].ssid,
- local->scan_req->ssids[i].ssid_len);
+ local->scan_req->ssids[i].ssid_len,
+ local->scan_req->ie, local->scan_req->ie_len);
next_delay = IEEE80211_CHANNEL_TIME;
break;
}