summaryrefslogtreecommitdiff
path: root/net/mac80211/he.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2021-06-18 13:41:50 +0300
committerJohannes Berg <johannes.berg@intel.com>2021-06-23 12:33:26 +0300
commitbac2fd3d753430032043098dd55543037e3f7a60 (patch)
treec2fe8c5cf969c05d77f3543a243171db24b49bbf /net/mac80211/he.c
parent64a8747238291c7c497517ab2590c473f708d9be (diff)
downloadlinux-bac2fd3d753430032043098dd55543037e3f7a60.tar.xz
mac80211: remove use of ieee80211_get_he_sta_cap()
All uses of ieee80211_get_he_sta_cap() were actually wrong, in net/mac80211/mlme.c they were wrong because that code is also used for P2P (which is a different interface type), in net/mac80211/main.c that should check all interface types. Fix all that. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Link: https://lore.kernel.org/r/iwlwifi.20210618133832.ede114bc8b46.Ibcd9a5d98430e936344eb6d242ef8a65c2f59b74@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/he.c')
-rw-r--r--net/mac80211/he.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/he.c b/net/mac80211/he.c
index 0c0b970835ce..5984a9dac0bc 100644
--- a/net/mac80211/he.c
+++ b/net/mac80211/he.c
@@ -120,7 +120,9 @@ ieee80211_he_cap_ie_to_sta_he_cap(struct ieee80211_sub_if_data *sdata,
memset(he_cap, 0, sizeof(*he_cap));
- if (!he_cap_ie || !ieee80211_get_he_sta_cap(sband))
+ if (!he_cap_ie ||
+ !ieee80211_get_he_iftype_cap(sband,
+ ieee80211_vif_type_p2p(&sdata->vif)))
return;
/* Make sure size is OK */