mac80211: he: remove non-bss-conf fields from bss_conf

ack_enabled and multi_sta_back_32bit are station capabilities
and should not be in the bss_conf structure.

Signed-off-by: Shaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20201129172929.69a7f7753444.I405c4b5245145e24577512c477f19131d4036489@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 05c7524bab26903de9e27ed65b598c610eafdd39..1328b7166460df6ffc5173b36b997f73d038097a 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -635,9 +635,7 @@ struct ieee80211_fils_discovery {
 struct ieee80211_bss_conf {
        const u8 *bssid;
        u8 htc_trig_based_pkt_ext;
-       bool multi_sta_back_32bit;
        bool uora_exists;
-       bool ack_enabled;
        u8 uora_ocw_range;
        u16 frame_time_rts_th;
        bool he_support;

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 6adfcb9c06dcc516cf215cdc5b0ea7ed1524099e..b0afb61d9e8498b2d75db0c08f0e042dff7467e8 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3494,14 +3494,6 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
                        le32_get_bits(elems->he_operation->he_oper_params,
                              IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK);
 
-               bss_conf->multi_sta_back_32bit =
-                       sta->sta.he_cap.he_cap_elem.mac_cap_info[2] &
-                       IEEE80211_HE_MAC_CAP2_32BIT_BA_BITMAP;
-
-               bss_conf->ack_enabled =
-                       sta->sta.he_cap.he_cap_elem.mac_cap_info[2] &
-                       IEEE80211_HE_MAC_CAP2_ACK_EN;
-
                bss_conf->uora_exists = !!elems->uora_element;
                if (elems->uora_element)
                        bss_conf->uora_ocw_range = elems->uora_element[0];