mac80211: Remove a couple of obsolete TODO

BugLink: https://bugs.launchpad.net/bugs/1969110
[ Upstream commit cee04f3c3a00ffd2a2a6ed1028e0ab58a3a28d25 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit a41efae062bf349d26a1efe4d605a2cbb1c7ebfd)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 45fb517591ee9cdde13334d22730593ac9783b61..5311c3cd3050d008ba33cb7109daac130a2b227d 100644 (file)
--- 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 6c8505edce75b5f1e88d8dfff76894d59c50e73c..8d9fe27658360ad68dde68373d997d73ccdf254f 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -650,10 +650,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) +