From: Johannes Berg Date: Thu, 28 Mar 2013 09:26:17 +0000 (+0100) Subject: mac80211: use second center_freq segment only in 80+80 X-Git-Tag: v3.10-rc2~34^2~21^2^2~80^2~32 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6553bf04ff6686db658e09626edad003809f6baf;p=platform%2Fkernel%2Flinux-stable.git 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 --- diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index cf40fac..2a2c453 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)