From f704e4f83c6fd21fb39046fa328efb51bee6383b Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 4 Jul 2023 06:03:15 +0200 Subject: [PATCH] mt76: mt7915: fix copy&paste issue on capability check rework MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes disabling capabilities in AP mode via config Reported-by: Money Wang (王信安) Signed-off-by: Felix Fietkau --- mt7915/main.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/mt7915/main.c b/mt7915/main.c index 7c05893d..33bfa4a6 100644 --- a/mt7915/main.c +++ b/mt7915/main.c @@ -664,14 +664,15 @@ mt7915_vif_check_caps(struct mt7915_phy *phy, struct ieee80211_vif *vif) struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv; struct mt7915_vif_cap *vc = &mvif->cap; - vc->vht_ldpc = mvif->cap.vht_ldpc; - vc->vht_su_ebfer = mvif->cap.vht_su_ebfer; - vc->vht_su_ebfee = mvif->cap.vht_su_ebfee; - vc->vht_mu_ebfer = mvif->cap.vht_mu_ebfer; - vc->vht_mu_ebfee = mvif->cap.vht_mu_ebfee; - vc->he_ldpc = mvif->cap.he_ldpc; - vc->he_su_ebfer = mvif->cap.he_su_ebfer; - vc->he_su_ebfee = mvif->cap.he_su_ebfee; + vc->ht_ldpc = vif->bss_conf.ht_ldpc; + vc->vht_ldpc = vif->bss_conf.vht_ldpc; + vc->vht_su_ebfer = vif->bss_conf.vht_su_beamformer; + vc->vht_su_ebfee = vif->bss_conf.vht_su_beamformee; + vc->vht_mu_ebfer = vif->bss_conf.vht_mu_beamformer; + vc->vht_mu_ebfee = vif->bss_conf.vht_mu_beamformee; + vc->he_ldpc = vif->bss_conf.he_ldpc; + vc->he_su_ebfer = vif->bss_conf.he_su_beamformer; + vc->he_su_ebfee = vif->bss_conf.he_su_beamformee; vc->he_mu_ebfer = vif->bss_conf.he_mu_beamformer; }