diff options
| author | Luciano Coelho <luciano.coelho@intel.com> | 2014-10-28 13:33:04 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-10-29 16:37:45 +0100 |
| commit | 84469a45a1bedec9918e94ab2f78c5dc0739e4a7 (patch) | |
| tree | 5fedc36289fa06ce9a234e768eab84fa0512e0d9 /net/mac80211/mesh.c | |
| parent | 10b68487869031828aede7313c2befc53d6d30ec (diff) | |
| download | linux-84469a45a1bedec9918e94ab2f78c5dc0739e4a7.tar.gz linux-84469a45a1bedec9918e94ab2f78c5dc0739e4a7.tar.bz2 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/mesh.c')
| -rw-r--r-- | net/mac80211/mesh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index e9f99c1e3fad..0c8b2a77d312 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -874,7 +874,7 @@ ieee80211_mesh_process_chnswitch(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, band, + err = ieee80211_parse_ch_switch_ie(sdata, elems, band, sta_flags, sdata->vif.addr, &csa_ie); if (err < 0) |