aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-03-28 05:26:17 -0400
committerJohannes Berg <johannes.berg@intel.com>2013-04-16 09:29:42 -0400
commit6553bf04ff6686db658e09626edad003809f6baf (patch)
tree69963e567e69b04dd9add1689e50dd20db16605a /net/mac80211/mlme.c
parent990de49f74e772b6db5208457b7aa712a5f4db86 (diff)
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/mlme.c')
-rw-r--r--net/mac80211/mlme.c10
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,
303 channel->band); 303 channel->band);
304 vht_chandef.center_freq2 = 0; 304 vht_chandef.center_freq2 = 0;
305 305
306 if (vht_oper->center_freq_seg2_idx)
307 vht_chandef.center_freq2 =
308 ieee80211_channel_to_frequency(
309 vht_oper->center_freq_seg2_idx,
310 channel->band);
311
312 switch (vht_oper->chan_width) { 306 switch (vht_oper->chan_width) {
313 case IEEE80211_VHT_CHANWIDTH_USE_HT: 307 case IEEE80211_VHT_CHANWIDTH_USE_HT:
314 vht_chandef.width = chandef->width; 308 vht_chandef.width = chandef->width;
@@ -321,6 +315,10 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata,
321 break; 315 break;
322 case IEEE80211_VHT_CHANWIDTH_80P80MHZ: 316 case IEEE80211_VHT_CHANWIDTH_80P80MHZ:
323 vht_chandef.width = NL80211_CHAN_WIDTH_80P80; 317 vht_chandef.width = NL80211_CHAN_WIDTH_80P80;
318 vht_chandef.center_freq2 =
319 ieee80211_channel_to_frequency(
320 vht_oper->center_freq_seg2_idx,
321 channel->band);
324 break; 322 break;
325 default: 323 default:
326 if (verbose) 324 if (verbose)