diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-07-23 14:53:27 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-07-31 16:18:56 +0200 |
| commit | 6b77863b719a4e32909c218c0d5a83a14f4d98c5 (patch) | |
| tree | d259001a7b7c4963de72cd6b3b9bf8d350d2f1c8 /net/mac80211/mlme.c | |
| parent | 679ef4eadde1f8e55074427c0d8de2da55ca81f9 (diff) | |
| download | lwn-6b77863b719a4e32909c218c0d5a83a14f4d98c5.tar.gz lwn-6b77863b719a4e32909c218c0d5a83a14f4d98c5.zip | |
mac80211: fix current vs. operating channel in preq/beacon
When sending probe requests, e.g. during software scanning,
these will go out on the *current* channel, so their IEs
need to be built from the current channel. At other times,
e.g. for beacons or probe request templates, the IEs will
be used on the *operating* channel and using the current
channel instead might result in errors.
Add the appropriate parameters to respect the difference.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 2657a5645a8a..c416a08d90f1 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1683,7 +1683,9 @@ struct sk_buff *ieee80211_ap_probereq_get(struct ieee80211_hw *hw, ssid_len = ssid[1]; skb = ieee80211_build_probe_req(sdata, cbss->bssid, - (u32) -1, ssid + 2, ssid_len, + (u32) -1, + sdata->local->oper_channel, + ssid + 2, ssid_len, NULL, 0, true); return skb; |