diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-07-30 12:26:34 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-08-20 14:13:45 +0200 |
| commit | fe94fe05e9fb7c1bea482d1b0fd09029a711cce2 (patch) | |
| tree | 3ce8972df96c159116ecf384af549f272dc66a48 /net/mac80211/scan.c | |
| parent | c0af07340aae5db9f976bfe71e2e9bcab3169409 (diff) | |
| download | blackbird-op-linux-fe94fe05e9fb7c1bea482d1b0fd09029a711cce2.tar.gz blackbird-op-linux-fe94fe05e9fb7c1bea482d1b0fd09029a711cce2.zip | |
mac80211: pass channel to ieee80211_send_probe_req
In multi-channel scenarios, the channel that we will
transmit a probe request on isn't always the current
channel (which will be NULL anyway) but will instead
be the channel that the AP is on. Pass the channel
to the ieee80211_send_probe_req() function so it can
be used in the different scenarios. The scan code
continues to pass the current channel, of course.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/scan.c')
| -rw-r--r-- | net/mac80211/scan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index 4b75ddeef6b1..ef1d69306315 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -416,7 +416,8 @@ static void ieee80211_scan_state_send_probe(struct ieee80211_local *local, local->scan_req->ssids[i].ssid_len, local->scan_req->ie, local->scan_req->ie_len, local->scan_req->rates[band], false, - local->scan_req->no_cck); + local->scan_req->no_cck, + local->hw.conf.channel); /* * After sending probe requests, wait for probe responses |
