Skip to content

Commit dcf3c8f

Browse files
shaydeveljmberg-intel
authored andcommitted
mac80211: 160MHz with extended NSS BW in CSA
Upon receiving CSA with 160MHz extended NSS BW from associated AP, STA should set the HT operation_mode based on new_center_freq_seg1 because it is later used as ccfs2 in ieee80211_chandef_vht_oper(). Signed-off-by: Aviad Brikman <[email protected]> Signed-off-by: Shay Bar <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Johannes Berg <[email protected]>
1 parent 1c45ba9 commit dcf3c8f

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

net/mac80211/spectmgmt.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,20 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata,
133133
}
134134

135135
if (wide_bw_chansw_ie) {
136+
u8 new_seg1 = wide_bw_chansw_ie->new_center_freq_seg1;
136137
struct ieee80211_vht_operation vht_oper = {
137138
.chan_width =
138139
wide_bw_chansw_ie->new_channel_width,
139140
.center_freq_seg0_idx =
140141
wide_bw_chansw_ie->new_center_freq_seg0,
141-
.center_freq_seg1_idx =
142-
wide_bw_chansw_ie->new_center_freq_seg1,
142+
.center_freq_seg1_idx = new_seg1,
143143
/* .basic_mcs_set doesn't matter */
144144
};
145-
struct ieee80211_ht_operation ht_oper = {};
145+
struct ieee80211_ht_operation ht_oper = {
146+
.operation_mode =
147+
cpu_to_le16(new_seg1 <<
148+
IEEE80211_HT_OP_MODE_CCFS2_SHIFT),
149+
};
146150

147151
/* default, for the case of IEEE80211_VHT_CHANWIDTH_USE_HT,
148152
* to the previously parsed chandef

0 commit comments

Comments
 (0)