diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-03-28 10:26:17 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-16 15:29:42 +0200 |
| commit | 6553bf04ff6686db658e09626edad003809f6baf (patch) | |
| tree | 69963e567e69b04dd9add1689e50dd20db16605a /net/mac80211 | |
| parent | 990de49f74e772b6db5208457b7aa712a5f4db86 (diff) | |
| download | linux-6553bf04ff6686db658e09626edad003809f6baf.tar.gz linux-6553bf04ff6686db658e09626edad003809f6baf.tar.bz2 linux-6553bf04ff6686db658e09626edad003809f6baf.zip | |
mac80211: use second center_freq segment only in 80+80
The field is otherwise reserved, so we shouldn't read
and reject it, though any sane system will probably
have to set it to 0 anyway.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/mlme.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index cf40fac0aae8..2a2c45354498 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -303,12 +303,6 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, channel->band); vht_chandef.center_freq2 = 0; - if (vht_oper->center_freq_seg2_idx) - vht_chandef.center_freq2 = - ieee80211_channel_to_frequency( - vht_oper->center_freq_seg2_idx, - channel->band); - switch (vht_oper->chan_width) { case IEEE80211_VHT_CHANWIDTH_USE_HT: vht_chandef.width = chandef->width; @@ -321,6 +315,10 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, break; case IEEE80211_VHT_CHANWIDTH_80P80MHZ: vht_chandef.width = NL80211_CHAN_WIDTH_80P80; + vht_chandef.center_freq2 = + ieee80211_channel_to_frequency( + vht_oper->center_freq_seg2_idx, + channel->band); break; default: if (verbose) |