leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Shaul Triebitz
2020-11-29 17:30:43 +02:00
committed by Johannes Berg
parent 84674ef4d6
commit 081e1e7ece
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/mac80211.h
View File

@@ -635,9 +635,7 @@ struct ieee80211_fils_discovery {
struct ieee80211_bss_conf { struct ieee80211_bss_conf {
const u8 *bssid; const u8 *bssid;
u8 htc_trig_based_pkt_ext; u8 htc_trig_based_pkt_ext;
bool multi_sta_back_32bit;
bool uora_exists; bool uora_exists;
bool ack_enabled;
u8 uora_ocw_range; u8 uora_ocw_range;
u16 frame_time_rts_th; u16 frame_time_rts_th;
bool he_support; bool he_support;

8
net/mac80211/mlme.c
View File

@@ -3494,14 +3494,6 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
le32_get_bits(elems->he_operation->he_oper_params, le32_get_bits(elems->he_operation->he_oper_params,
IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK); 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; bss_conf->uora_exists = !!elems->uora_element;
if (elems->uora_element) if (elems->uora_element)
bss_conf->uora_ocw_range = elems->uora_element[0]; bss_conf->uora_ocw_range = elems->uora_element[0];