diff options
| author | Luciano Coelho | 2014-10-28 12:33:04 +0100 |
|---|---|---|
| committer | Johannes Berg | 2014-10-29 16:37:45 +0100 |
| commit | 84469a45a1bedec9918e94ab2f78c5dc0739e4a7 (patch) | |
| tree | 5fedc36289fa06ce9a234e768eab84fa0512e0d9 /net/mac80211/ibss.c | |
| parent | mac80211: flush keys for AP mode on ieee80211_do_stop (diff) | |
| download | kernel-qcow2-linux-84469a45a1bedec9918e94ab2f78c5dc0739e4a7.tar.gz kernel-qcow2-linux-84469a45a1bedec9918e94ab2f78c5dc0739e4a7.tar.xz kernel-qcow2-linux-84469a45a1bedec9918e94ab2f78c5dc0739e4a7.zip | |
mac80211: use secondary channel offset IE also beacons during CSA
If we are switching from an HT40+ to an HT40- channel (or vice-versa),
we need the secondary channel offset IE to specify what is the
post-CSA offset to be used. This applies both to beacons and to probe
responses.
In ieee80211_parse_ch_switch_ie() we were ignoring this IE from
beacons and using the *current* HT information IE instead. This was
causing us to use the same offset as before the switch.
Fix that by using the secondary channel offset IE also for beacons and
don't ever use the pre-switch offset. Additionally, remove the
"beacon" argument from ieee80211_parse_ch_switch_ie(), since it's not
needed anymore.
Cc: stable@vger.kernel.org
Reported-by: Jouni Malinen <j@w1.fi>
Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ibss.c')
| -rw-r--r-- | net/mac80211/ibss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 56b53571c807..509bc157ce55 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -805,7 +805,7 @@ ieee80211_ibss_process_chanswitch(struct ieee80211_sub_if_data *sdata, memset(¶ms, 0, sizeof(params)); memset(&csa_ie, 0, sizeof(csa_ie)); - err = ieee80211_parse_ch_switch_ie(sdata, elems, beacon, + err = ieee80211_parse_ch_switch_ie(sdata, elems, ifibss->chandef.chan->band, sta_flags, ifibss->bssid, &csa_ie); /* can't switch to destination channel, fail */ |