mac80211: pass station to ieee80211_vht_cap_ie_to_sta_vht_cap

[mirror_ubuntu-bionic-kernel.git] / net / mac80211 / vht.c

diff --git a/net/mac80211/vht.c b/net/mac80211/vht.c
index f311388aeedf0f1dd8d2ef7d28a62331a2b0dbfe..1606aa165d5f536a0c4a7eb39699d677ecae738e 100644 (file)
--- a/net/mac80211/vht.c
+++ b/net/mac80211/vht.c
@@ -15,13 +15,15 @@
 void ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata,
                                         struct ieee80211_supported_band *sband,
                                         struct ieee80211_vht_cap *vht_cap_ie,
-                                        struct ieee80211_sta_vht_cap *vht_cap)
+                                        struct sta_info *sta)
 {
-       if (WARN_ON_ONCE(!vht_cap))
-               return;
+       struct ieee80211_sta_vht_cap *vht_cap = &sta->sta.vht_cap;
 
        memset(vht_cap, 0, sizeof(*vht_cap));
 
+       if (!sta->sta.ht_cap.ht_supported)
+               return;
+
        if (!vht_cap_ie || !sband->vht_cap.vht_supported)
                return;