wifi: cfg80211: remove HE/SAE H2E required fields

These are not used by any drivers, even the HT/VHT ones
are only used by the qtnfmac driver. Remove the fields.

Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20260415144514.a4a3ebb0f95a.Ifadd953e13133e7a45ee3318fb04b2ff9dde62e4@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 9d3639ff9c28e7123f1866d646e02cff2cb538fc..8bebf45af95dc504c79b9374e55ed106a16f6e53 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1529,8 +1529,6 @@ struct cfg80211_s1g_short_beacon {
  * @ht_required: stations must support HT
  * @vht_required: stations must support VHT
  * @twt_responder: Enable Target Wait Time
- * @he_required: stations must support HE
- * @sae_h2e_required: stations must support direct H2E technique in SAE
  * @flags: flags, as defined in &enum nl80211_ap_settings_flags
  * @he_obss_pd: OBSS Packet Detection settings
  * @he_oper: HE operation IE (or %NULL if HE isn't enabled)
@@ -1566,7 +1564,7 @@ struct cfg80211_ap_settings {
        const struct ieee80211_eht_cap_elem *eht_cap;
        const struct ieee80211_eht_operation *eht_oper;
        const struct ieee80211_uhr_operation *uhr_oper;
-       bool ht_required, vht_required, he_required, sae_h2e_required;
+       bool ht_required, vht_required;
        bool twt_responder;
        u32 flags;
        struct ieee80211_he_obss_pd he_obss_pd;

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index b0bb94f29e563b3505149a1073ffd0ce4db147dc..a4d9b406850606e384190b44f13b476ea46ba067 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -6641,10 +6641,6 @@ static void nl80211_check_ap_rate_selectors(struct cfg80211_ap_settings *params,
                        params->ht_required = true;
                if (rates->data[i] == BSS_MEMBERSHIP_SELECTOR_VHT_PHY)
                        params->vht_required = true;
-               if (rates->data[i] == BSS_MEMBERSHIP_SELECTOR_HE_PHY)
-                       params->he_required = true;
-               if (rates->data[i] == BSS_MEMBERSHIP_SELECTOR_SAE_H2E)
-                       params->sae_h2e_required = true;
        }
 }