diff options
| author | Ilan Peer <ilan.peer@intel.com> | 2021-11-29 15:32:44 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2021-12-20 10:36:14 +0100 |
| commit | cee04f3c3a00ffd2a2a6ed1028e0ab58a3a28d25 (patch) | |
| tree | fe43e225c187d9b95d9720ae1fd2b0b31ab9c21c /net/mac80211 | |
| parent | 57553c3a6cfe5a30c40c334e4f3b4ece06764b36 (diff) | |
| download | linux-cee04f3c3a00ffd2a2a6ed1028e0ab58a3a28d25.tar.gz linux-cee04f3c3a00ffd2a2a6ed1028e0ab58a3a28d25.tar.bz2 linux-cee04f3c3a00ffd2a2a6ed1028e0ab58a3a28d25.zip | |
mac80211: Remove a couple of obsolete TODO
The HE capability IE is an extension IE so remove
an irrelevant comments.
Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211129152938.550b95b5fca7.Ia31395e880172aefcc0a8c70ed060f84b94bdb83@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/main.c | 13 | ||||
| -rw-r--r-- | net/mac80211/mlme.c | 4 |
2 files changed, 5 insertions, 12 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 45fb517591ee..5311c3cd3050 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -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. */ diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 54ab0e1ef6ca..805aafccff26 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -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) + |