Commit cee04f3c authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg
Browse files

mac80211: Remove a couple of obsolete TODO 



The HE capability IE is an extension IE so remove
an irrelevant comments.

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211129152938.550b95b5fca7.Ia31395e880172aefcc0a8c70ed060f84b94bdb83@changeid


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

net/mac80211/main.c

+5 −8
Original line number Diff line number Diff line
@@ -1131,17 +1131,14 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 
		local->scan_ies_len +=

			2 + sizeof(struct ieee80211_vht_cap);



	/* HE cap element is variable in size - set len to allow max size */

	/*

	 * TODO: 1 is added at the end of the calculation to accommodate for

	 *	the temporary placing of the HE capabilities IE under EXT.

	 *	Remove it once it is placed in the final place.

	 */

	if (supp_he)

	 * HE cap element is variable in size - set len to allow max size */

	if (supp_he) {

		local->scan_ies_len +=

			2 + sizeof(struct ieee80211_he_cap_elem) +

			3 + sizeof(struct ieee80211_he_cap_elem) +

			sizeof(struct ieee80211_he_mcs_nss_supp) +

			IEEE80211_HE_PPE_THRES_MAX_LEN + 1;

			IEEE80211_HE_PPE_THRES_MAX_LEN;

	}



	if (!local->ops->hw_scan) {

		/* For hw_scan, driver needs to set these up. */

net/mac80211/mlme.c

+0 −4
Original line number Diff line number Diff line
@@ -649,10 +649,6 @@ static void ieee80211_add_he_ie(struct ieee80211_sub_if_data *sdata, 
	if (!he_cap || !reg_cap)

		return;



	/*

	 * TODO: the 1 added is because this temporarily is under the EXTENSION

	 * IE. Get rid of it when it moves.

	 */

	he_cap_size =

		2 + 1 + sizeof(he_cap->he_cap_elem) +

		ieee80211_he_mcs_nss_size(&he_cap->he_cap_elem) +