aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/scan.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2018-05-28 15:47:38 +0200
committerJohannes Berg <johannes@sipsolutions.net>2018-06-15 13:34:21 +0200
commit00387f321537395f62d5c0eca64c2d7838f39ac3 (patch)
treeb893501f3b23f3a2ea21a9b288d7364ccc0eb7cf /net/mac80211/scan.c
parentnl80211: refactor common code in scan flags checks (diff)
downloadlinux-dev-00387f321537395f62d5c0eca64c2d7838f39ac3.tar.xz
linux-dev-00387f321537395f62d5c0eca64c2d7838f39ac3.zip
mac80211: add probe request building flags
Add flags to pass through to probe request building and change the "bool directed" to be one of them. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Diffstat (limited to 'net/mac80211/scan.c')
-rw-r--r--net/mac80211/scan.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index a3b1bcc2b461..8e28d8de26aa 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -336,7 +336,7 @@ static bool ieee80211_prep_hw_scan(struct ieee80211_local *local)
local->hw_scan_ies_bufsize,
&local->hw_scan_req->ies,
req->ie, req->ie_len,
- bands_used, req->rates, &chandef);
+ bands_used, req->rates, &chandef, 0);
local->hw_scan_req->req.ie_len = ielen;
local->hw_scan_req->req.no_cck = req->no_cck;
ether_addr_copy(local->hw_scan_req->req.mac_addr, req->mac_addr);
@@ -552,7 +552,7 @@ static void ieee80211_scan_state_send_probe(struct ieee80211_local *local,
sdata, local->scan_addr, scan_req->bssid,
scan_req->ssids[i].ssid, scan_req->ssids[i].ssid_len,
scan_req->ie, scan_req->ie_len,
- scan_req->rates[band], false,
+ scan_req->rates[band], 0,
tx_flags, local->hw.conf.chandef.chan, true);
/*
@@ -1167,7 +1167,8 @@ int __ieee80211_request_sched_scan_start(struct ieee80211_sub_if_data *sdata,
ieee80211_build_preq_ies(local, ie, num_bands * iebufsz,
&sched_scan_ies, req->ie,
- req->ie_len, bands_used, rate_masks, &chandef);
+ req->ie_len, bands_used, rate_masks, &chandef,
+ 0);
ret = drv_sched_scan_start(local, sdata, req, &sched_scan_ies);
if (ret == 0) {