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/util.c | |
| parent | mac80211: convert ops checks to WARN_ON (diff) | |
| download | linux-fe94fe05e9fb7c1bea482d1b0fd09029a711cce2.tar.xz 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/util.c')
| -rw-r--r-- | net/mac80211/util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 79bce870ad78..471fb0516c99 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1163,12 +1163,12 @@ struct sk_buff *ieee80211_build_probe_req(struct ieee80211_sub_if_data *sdata, void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst, const u8 *ssid, size_t ssid_len, const u8 *ie, size_t ie_len, - u32 ratemask, bool directed, bool no_cck) + u32 ratemask, bool directed, bool no_cck, + struct ieee80211_channel *channel) { struct sk_buff *skb; - skb = ieee80211_build_probe_req(sdata, dst, ratemask, - sdata->local->hw.conf.channel, + skb = ieee80211_build_probe_req(sdata, dst, ratemask, channel, ssid, ssid_len, ie, ie_len, directed); if (skb) { |