Commit 7eb26df2 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: add ability to parse CCFS2 



With newer VHT implementations, it's necessary to look at the
HT operation's CCFS2 field to identify the actual bandwidth
used.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 09b4a4fa

net/mac80211/ibss.c

+3 −1
Original line number Diff line number Diff line
@@ -1070,7 +1070,9 @@ static void ieee80211_update_sta_info(struct ieee80211_sub_if_data *sdata, 
			struct ieee80211_vht_cap cap_ie;

			struct ieee80211_sta_vht_cap cap = sta->sta.vht_cap;



			ieee80211_chandef_vht_oper(elems->vht_operation,

			ieee80211_chandef_vht_oper(&local->hw,

						   elems->vht_operation,

						   elems->ht_operation,

						   &chandef);

			memcpy(&cap_ie, elems->vht_cap_elem, sizeof(cap_ie));

			ieee80211_vht_cap_ie_to_sta_vht_cap(sdata, sband,

net/mac80211/ieee80211_i.h

+3 −1
Original line number Diff line number Diff line
@@ -2112,7 +2112,9 @@ u8 *ieee80211_add_wmm_info_ie(u8 *buf, u8 qosinfo); 
/* channel management */

bool ieee80211_chandef_ht_oper(const struct ieee80211_ht_operation *ht_oper,

			       struct cfg80211_chan_def *chandef);

bool ieee80211_chandef_vht_oper(const struct ieee80211_vht_operation *oper,

bool ieee80211_chandef_vht_oper(struct ieee80211_hw *hw,

				const struct ieee80211_vht_operation *oper,

				const struct ieee80211_ht_operation *htop,

				struct cfg80211_chan_def *chandef);

u32 ieee80211_chandef_downgrade(struct cfg80211_chan_def *c);

net/mac80211/mesh.c

+4 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2008, 2009 open80211s Ltd.

 * Copyright (C) 2018 Intel Corporation

 * Authors:    Luis Carlos Cobo <luisca@cozybit.com>

 * 	       Javier Cardona <javier@cozybit.com>

 *
@@ -98,7 +99,9 @@ bool mesh_matches_local(struct ieee80211_sub_if_data *sdata, 
	cfg80211_chandef_create(&sta_chan_def, sdata->vif.bss_conf.chandef.chan,

				NL80211_CHAN_NO_HT);

	ieee80211_chandef_ht_oper(ie->ht_operation, &sta_chan_def);

	ieee80211_chandef_vht_oper(ie->vht_operation, &sta_chan_def);

	ieee80211_chandef_vht_oper(&sdata->local->hw,

				   ie->vht_operation, ie->ht_operation,

				   &sta_chan_def);



	if (!cfg80211_chandef_compatible(&sdata->vif.bss_conf.chandef,

					 &sta_chan_def))

net/mac80211/mlme.c

+4 −2
Original line number Diff line number Diff line
@@ -220,7 +220,8 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, 
		memcpy(&he_oper_vht_cap, he_oper->optional, 3);

		he_oper_vht_cap.basic_mcs_set = cpu_to_le16(0);



		if (!ieee80211_chandef_vht_oper(&he_oper_vht_cap,

		if (!ieee80211_chandef_vht_oper(&sdata->local->hw,

						&he_oper_vht_cap, ht_oper,

						&vht_chandef)) {

			if (!(ifmgd->flags & IEEE80211_STA_DISABLE_HE))

				sdata_info(sdata,
@@ -228,7 +229,8 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, 
			ret = IEEE80211_STA_DISABLE_HE;

			goto out;

		}

	} else if (!ieee80211_chandef_vht_oper(vht_oper, &vht_chandef)) {

	} else if (!ieee80211_chandef_vht_oper(&sdata->local->hw, vht_oper,

					       ht_oper, &vht_chandef)) {

		if (!(ifmgd->flags & IEEE80211_STA_DISABLE_VHT))

			sdata_info(sdata,

				   "AP VHT information is invalid, disable VHT\n");

net/mac80211/spectmgmt.c

+4 −1
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata, 
				wide_bw_chansw_ie->new_center_freq_seg1,

			/* .basic_mcs_set doesn't matter */

		};

		struct ieee80211_ht_operation ht_oper = {};



		/* default, for the case of IEEE80211_VHT_CHANWIDTH_USE_HT,

		 * to the previously parsed chandef
@@ -151,7 +152,9 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata, 
		new_vht_chandef = csa_ie->chandef;



		/* ignore if parsing fails */

		if (!ieee80211_chandef_vht_oper(&vht_oper, &new_vht_chandef))

		if (!ieee80211_chandef_vht_oper(&sdata->local->hw,

						&vht_oper, &ht_oper,

						&new_vht_chandef))

			new_vht_chandef.chan = NULL;



		if (sta_flags & IEEE80211_STA_DISABLE_80P80MHZ &&