diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-02-27 20:47:53 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-23 21:38:11 -0700 |
| commit | c02d9a9697134e6fd6527c33ae0d78a8faad6e41 (patch) | |
| tree | 15c50661d5b4c128aa7e69394c4e2c15565a35bd /net/mac80211 | |
| parent | e713fe3d4bde100807377a2699587d05721f909b (diff) | |
| download | linux-3.10-c02d9a9697134e6fd6527c33ae0d78a8faad6e41.tar.gz linux-3.10-c02d9a9697134e6fd6527c33ae0d78a8faad6e41.tar.bz2 linux-3.10-c02d9a9697134e6fd6527c33ae0d78a8faad6e41.zip | |
mac80211: fix association to 20/40 MHz VHT networks
commit cb664981607a6b5b3d670ad57bbda893b2528d96 upstream.
When a VHT network uses 20 or 40 MHz as per the HT operation
information, the channel center frequency segment 0 field in
the VHT operation information is reserved, so ignore it.
This fixes association with such networks when the AP puts 0
into the field, previously we'd disconnect due to an invalid
channel with the message
wlan0: AP VHT information is invalid, disable VHT
Fixes: f2d9d270c15ae ("mac80211: support VHT association")
Reported-by: Tim Nelson <tim.l.nelson@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/mlme.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 400b219ca09..49bc2246bd8 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -310,6 +310,7 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, switch (vht_oper->chan_width) { case IEEE80211_VHT_CHANWIDTH_USE_HT: vht_chandef.width = chandef->width; + vht_chandef.center_freq1 = chandef->center_freq1; break; case IEEE80211_VHT_CHANWIDTH_80MHZ: vht_chandef.width = NL80211_CHAN_WIDTH_80; |