| From f9c04f3a99e251532db5680d6dc2d2d44f5e831b Mon Sep 17 00:00:00 2001 |
| From: Shayne Chen <shayne.chen@mediatek.com> |
| Date: Tue, 13 Dec 2022 10:53:12 +0800 |
| Subject: [PATCH 4002/4002] mt76: revert some structs of wireless stack |
| |
| Signed-off-by: Shayne Chen <shayne.chen@mediatek.com> |
| --- |
| debugfs.c | 2 + |
| dma.c | 2 +- |
| mac80211.c | 4 +- |
| mt7615/main.c | 6 +- |
| mt7615/mcu.c | 8 +-- |
| mt76_connac_mcu.c | 108 +++++++++++++++--------------- |
| mt76x02_mac.c | 6 +- |
| mt7915/debugfs.c | 4 +- |
| mt7915/dma.c | 4 +- |
| mt7915/init.c | 3 +- |
| mt7915/mac.c | 2 +- |
| mt7915/main.c | 10 +-- |
| mt7915/mcu.c | 166 +++++++++++++++++++++++----------------------- |
| mt7915/testmode.c | 8 +-- |
| tx.c | 11 +-- |
| 15 files changed, 168 insertions(+), 176 deletions(-) |
| |
| diff --git a/debugfs.c b/debugfs.c |
| index 79064a4d..4a8e1864 100644 |
| --- a/debugfs.c |
| +++ b/debugfs.c |
| @@ -33,8 +33,10 @@ mt76_napi_threaded_set(void *data, u64 val) |
| if (!mt76_is_mmio(dev)) |
| return -EOPNOTSUPP; |
| |
| +#if 0 /* disable in backport 5.15 */ |
| if (dev->napi_dev.threaded != val) |
| return dev_set_threaded(&dev->napi_dev, val); |
| +#endif |
| |
| return 0; |
| } |
| diff --git a/dma.c b/dma.c |
| index 0914266a..21e88a2d 100644 |
| --- a/dma.c |
| +++ b/dma.c |
| @@ -939,7 +939,7 @@ mt76_dma_init(struct mt76_dev *dev, |
| dev->napi_dev.threaded = 1; |
| |
| mt76_for_each_q_rx(dev, i) { |
| - netif_napi_add(&dev->napi_dev, &dev->napi[i], poll); |
| + netif_napi_add(&dev->napi_dev, &dev->napi[i], poll, 64); |
| mt76_dma_rx_fill(dev, &dev->q_rx[i]); |
| napi_enable(&dev->napi[i]); |
| } |
| diff --git a/mac80211.c b/mac80211.c |
| index 15d300a9..be4a1408 100644 |
| --- a/mac80211.c |
| +++ b/mac80211.c |
| @@ -1511,7 +1511,7 @@ EXPORT_SYMBOL_GPL(mt76_get_sar_power); |
| static void |
| __mt76_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif) |
| { |
| - if (vif->bss_conf.csa_active && ieee80211_beacon_cntdwn_is_complete(vif)) |
| + if (vif->csa_active && ieee80211_beacon_cntdwn_is_complete(vif)) |
| ieee80211_csa_finish(vif); |
| } |
| |
| @@ -1533,7 +1533,7 @@ __mt76_csa_check(void *priv, u8 *mac, struct ieee80211_vif *vif) |
| { |
| struct mt76_dev *dev = priv; |
| |
| - if (!vif->bss_conf.csa_active) |
| + if (!vif->csa_active) |
| return; |
| |
| dev->csa_complete |= ieee80211_beacon_cntdwn_is_complete(vif); |
| diff --git a/mt7615/main.c b/mt7615/main.c |
| index ab4c1b44..8fb5b256 100644 |
| --- a/mt7615/main.c |
| +++ b/mt7615/main.c |
| @@ -474,7 +474,7 @@ static int mt7615_config(struct ieee80211_hw *hw, u32 changed) |
| |
| static int |
| mt7615_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, |
| - unsigned int link_id, u16 queue, |
| + u16 queue, |
| const struct ieee80211_tx_queue_params *params) |
| { |
| struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv; |
| @@ -556,7 +556,7 @@ static void mt7615_configure_filter(struct ieee80211_hw *hw, |
| static void mt7615_bss_info_changed(struct ieee80211_hw *hw, |
| struct ieee80211_vif *vif, |
| struct ieee80211_bss_conf *info, |
| - u64 changed) |
| + u32 changed) |
| { |
| struct mt7615_dev *dev = mt7615_hw_dev(hw); |
| struct mt7615_phy *phy = mt7615_hw_phy(hw); |
| @@ -599,7 +599,7 @@ static void mt7615_bss_info_changed(struct ieee80211_hw *hw, |
| } |
| |
| if (changed & BSS_CHANGED_ASSOC) |
| - mt7615_mac_set_beacon_filter(phy, vif, vif->cfg.assoc); |
| + mt7615_mac_set_beacon_filter(phy, vif, info->assoc); |
| |
| mt7615_mutex_release(dev); |
| } |
| diff --git a/mt7615/mcu.c b/mt7615/mcu.c |
| index e917d025..b2e1f388 100644 |
| --- a/mt7615/mcu.c |
| +++ b/mt7615/mcu.c |
| @@ -353,7 +353,7 @@ out: |
| static void |
| mt7615_mcu_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif) |
| { |
| - if (vif->bss_conf.csa_active) |
| + if (vif->csa_active) |
| ieee80211_csa_finish(vif); |
| } |
| |
| @@ -699,7 +699,7 @@ mt7615_mcu_add_beacon_offload(struct mt7615_dev *dev, |
| if (!enable) |
| goto out; |
| |
| - skb = ieee80211_beacon_get_template(hw, vif, &offs, 0); |
| + skb = ieee80211_beacon_get_template(hw, vif, &offs); |
| if (!skb) |
| return -EINVAL; |
| |
| @@ -1074,7 +1074,7 @@ mt7615_mcu_uni_add_beacon_offload(struct mt7615_dev *dev, |
| if (!enable) |
| goto out; |
| |
| - skb = ieee80211_beacon_get_template(mt76_hw(dev), vif, &offs, 0); |
| + skb = ieee80211_beacon_get_template(mt76_hw(dev), vif, &offs); |
| if (!skb) |
| return -EINVAL; |
| |
| @@ -2526,7 +2526,7 @@ int mt7615_mcu_set_bss_pm(struct mt7615_dev *dev, struct ieee80211_vif *vif, |
| u8 pad; |
| } req = { |
| .bss_idx = mvif->mt76.idx, |
| - .aid = cpu_to_le16(vif->cfg.aid), |
| + .aid = cpu_to_le16(vif->bss_conf.aid), |
| .dtim_period = vif->bss_conf.dtim_period, |
| .bcn_interval = cpu_to_le16(vif->bss_conf.beacon_int), |
| }; |
| diff --git a/mt76_connac_mcu.c b/mt76_connac_mcu.c |
| index 56493774..99851dc0 100644 |
| --- a/mt76_connac_mcu.c |
| +++ b/mt76_connac_mcu.c |
| @@ -197,7 +197,7 @@ int mt76_connac_mcu_set_vif_ps(struct mt76_dev *dev, struct ieee80211_vif *vif) |
| */ |
| } req = { |
| .bss_idx = mvif->idx, |
| - .ps_state = vif->cfg.ps ? 2 : 0, |
| + .ps_state = vif->bss_conf.ps ? 2 : 0, |
| }; |
| |
| if (vif->type != NL80211_IFTYPE_STATION) |
| @@ -409,7 +409,7 @@ void mt76_connac_mcu_sta_basic_tlv(struct sk_buff *skb, |
| else |
| conn_type = CONNECTION_INFRA_AP; |
| basic->conn_type = cpu_to_le32(conn_type); |
| - basic->aid = cpu_to_le16(vif->cfg.aid); |
| + basic->aid = cpu_to_le16(vif->bss_conf.aid); |
| break; |
| case NL80211_IFTYPE_ADHOC: |
| basic->conn_type = cpu_to_le32(CONNECTION_IBSS_ADHOC); |
| @@ -553,7 +553,7 @@ void mt76_connac_mcu_wtbl_generic_tlv(struct mt76_dev *dev, |
| |
| if (sta) { |
| if (vif->type == NL80211_IFTYPE_STATION) |
| - generic->partial_aid = cpu_to_le16(vif->cfg.aid); |
| + generic->partial_aid = cpu_to_le16(vif->bss_conf.aid); |
| else |
| generic->partial_aid = cpu_to_le16(sta->aid); |
| memcpy(generic->peer_addr, sta->addr, ETH_ALEN); |
| @@ -602,14 +602,14 @@ mt76_connac_mcu_sta_amsdu_tlv(struct sk_buff *skb, struct ieee80211_sta *sta, |
| vif->type != NL80211_IFTYPE_STATION) |
| return; |
| |
| - if (!sta->deflink.agg.max_amsdu_len) |
| + if (!sta->max_amsdu_len) |
| return; |
| |
| tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HW_AMSDU, sizeof(*amsdu)); |
| amsdu = (struct sta_rec_amsdu *)tlv; |
| amsdu->max_amsdu_num = 8; |
| amsdu->amsdu_en = true; |
| - amsdu->max_mpdu_size = sta->deflink.agg.max_amsdu_len >= |
| + amsdu->max_mpdu_size = sta->max_amsdu_len >= |
| IEEE80211_MAX_MPDU_LEN_VHT_7991; |
| |
| wcid->amsdu = true; |
| @@ -620,7 +620,7 @@ mt76_connac_mcu_sta_amsdu_tlv(struct sk_buff *skb, struct ieee80211_sta *sta, |
| static void |
| mt76_connac_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta) |
| { |
| - struct ieee80211_sta_he_cap *he_cap = &sta->deflink.he_cap; |
| + struct ieee80211_sta_he_cap *he_cap = &sta->he_cap; |
| struct ieee80211_he_cap_elem *elem = &he_cap->he_cap_elem; |
| struct sta_rec_he *he; |
| struct tlv *tlv; |
| @@ -708,7 +708,7 @@ mt76_connac_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta) |
| |
| he->he_cap = cpu_to_le32(cap); |
| |
| - switch (sta->deflink.bandwidth) { |
| + switch (sta->bandwidth) { |
| case IEEE80211_STA_RX_BW_160: |
| if (elem->phy_cap_info[0] & |
| IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G) |
| @@ -753,7 +753,7 @@ mt76_connac_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta) |
| static void |
| mt76_connac_mcu_sta_he_tlv_v2(struct sk_buff *skb, struct ieee80211_sta *sta) |
| { |
| - struct ieee80211_sta_he_cap *he_cap = &sta->deflink.he_cap; |
| + struct ieee80211_sta_he_cap *he_cap = &sta->he_cap; |
| struct ieee80211_he_cap_elem *elem = &he_cap->he_cap_elem; |
| struct sta_rec_he_v2 *he; |
| struct tlv *tlv; |
| @@ -764,7 +764,7 @@ mt76_connac_mcu_sta_he_tlv_v2(struct sk_buff *skb, struct ieee80211_sta *sta) |
| memcpy(he->he_phy_cap, elem->phy_cap_info, sizeof(he->he_phy_cap)); |
| memcpy(he->he_mac_cap, elem->mac_cap_info, sizeof(he->he_mac_cap)); |
| |
| - switch (sta->deflink.bandwidth) { |
| + switch (sta->bandwidth) { |
| case IEEE80211_STA_RX_BW_160: |
| if (elem->phy_cap_info[0] & |
| IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G) |
| @@ -780,7 +780,7 @@ mt76_connac_mcu_sta_he_tlv_v2(struct sk_buff *skb, struct ieee80211_sta *sta) |
| break; |
| } |
| |
| - he->pkt_ext = IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US; |
| + he->pkt_ext = IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US; |
| } |
| |
| static u8 |
| @@ -793,9 +793,9 @@ mt76_connac_get_phy_mode_v2(struct mt76_phy *mphy, struct ieee80211_vif *vif, |
| u8 mode = 0; |
| |
| if (sta) { |
| - ht_cap = &sta->deflink.ht_cap; |
| - vht_cap = &sta->deflink.vht_cap; |
| - he_cap = &sta->deflink.he_cap; |
| + ht_cap = &sta->ht_cap; |
| + vht_cap = &sta->vht_cap; |
| + he_cap = &sta->he_cap; |
| } else { |
| struct ieee80211_supported_band *sband; |
| |
| @@ -844,25 +844,25 @@ void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb, |
| u16 supp_rates; |
| |
| /* starec ht */ |
| - if (sta->deflink.ht_cap.ht_supported) { |
| + if (sta->ht_cap.ht_supported) { |
| struct sta_rec_ht *ht; |
| |
| tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HT, sizeof(*ht)); |
| ht = (struct sta_rec_ht *)tlv; |
| - ht->ht_cap = cpu_to_le16(sta->deflink.ht_cap.cap); |
| + ht->ht_cap = cpu_to_le16(sta->ht_cap.cap); |
| } |
| |
| /* starec vht */ |
| - if (sta->deflink.vht_cap.vht_supported) { |
| + if (sta->vht_cap.vht_supported) { |
| struct sta_rec_vht *vht; |
| int len; |
| |
| len = is_mt7921(dev) ? sizeof(*vht) : sizeof(*vht) - 4; |
| tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_VHT, len); |
| vht = (struct sta_rec_vht *)tlv; |
| - vht->vht_cap = cpu_to_le32(sta->deflink.vht_cap.cap); |
| - vht->vht_rx_mcs_map = sta->deflink.vht_cap.vht_mcs.rx_mcs_map; |
| - vht->vht_tx_mcs_map = sta->deflink.vht_cap.vht_mcs.tx_mcs_map; |
| + vht->vht_cap = cpu_to_le32(sta->vht_cap.cap); |
| + vht->vht_rx_mcs_map = sta->vht_cap.vht_mcs.rx_mcs_map; |
| + vht->vht_tx_mcs_map = sta->vht_cap.vht_mcs.tx_mcs_map; |
| } |
| |
| /* starec uapsd */ |
| @@ -871,11 +871,11 @@ void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb, |
| if (!is_mt7921(dev)) |
| return; |
| |
| - if (sta->deflink.ht_cap.ht_supported || sta->deflink.he_cap.has_he) |
| + if (sta->ht_cap.ht_supported || sta->he_cap.has_he) |
| mt76_connac_mcu_sta_amsdu_tlv(skb, sta, vif); |
| |
| /* starec he */ |
| - if (sta->deflink.he_cap.has_he) { |
| + if (sta->he_cap.has_he) { |
| mt76_connac_mcu_sta_he_tlv(skb, sta); |
| mt76_connac_mcu_sta_he_tlv_v2(skb, sta); |
| if (band == NL80211_BAND_6GHZ && |
| @@ -885,7 +885,7 @@ void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb, |
| tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HE_6G, |
| sizeof(*he_6g_capa)); |
| he_6g_capa = (struct sta_rec_he_6g_capa *)tlv; |
| - he_6g_capa->capa = sta->deflink.he_6ghz_capa.capa; |
| + he_6g_capa->capa = sta->he_6ghz_capa.capa; |
| } |
| } |
| |
| @@ -895,14 +895,14 @@ void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb, |
| phy->basic_rate = cpu_to_le16((u16)vif->bss_conf.basic_rates); |
| phy->rcpi = rcpi; |
| phy->ampdu = FIELD_PREP(IEEE80211_HT_AMPDU_PARM_FACTOR, |
| - sta->deflink.ht_cap.ampdu_factor) | |
| + sta->ht_cap.ampdu_factor) | |
| FIELD_PREP(IEEE80211_HT_AMPDU_PARM_DENSITY, |
| - sta->deflink.ht_cap.ampdu_density); |
| + sta->ht_cap.ampdu_density); |
| |
| tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_RA, sizeof(*ra_info)); |
| ra_info = (struct sta_rec_ra_info *)tlv; |
| |
| - supp_rates = sta->deflink.supp_rates[band]; |
| + supp_rates = sta->supp_rates[band]; |
| if (band == NL80211_BAND_2GHZ) |
| supp_rates = FIELD_PREP(RA_LEGACY_OFDM, supp_rates >> 4) | |
| FIELD_PREP(RA_LEGACY_CCK, supp_rates & 0xf); |
| @@ -911,18 +911,18 @@ void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb, |
| |
| ra_info->legacy = cpu_to_le16(supp_rates); |
| |
| - if (sta->deflink.ht_cap.ht_supported) |
| + if (sta->ht_cap.ht_supported) |
| memcpy(ra_info->rx_mcs_bitmask, |
| - sta->deflink.ht_cap.mcs.rx_mask, |
| + sta->ht_cap.mcs.rx_mask, |
| HT_MCS_MASK_NUM); |
| |
| tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_STATE, sizeof(*state)); |
| state = (struct sta_rec_state *)tlv; |
| state->state = sta_state; |
| |
| - if (sta->deflink.vht_cap.vht_supported) { |
| - state->vht_opmode = sta->deflink.bandwidth; |
| - state->vht_opmode |= (sta->deflink.rx_nss - 1) << |
| + if (sta->vht_cap.vht_supported) { |
| + state->vht_opmode = sta->bandwidth; |
| + state->vht_opmode |= (sta->rx_nss - 1) << |
| IEEE80211_OPMODE_NOTIF_RX_NSS_SHIFT; |
| } |
| } |
| @@ -938,7 +938,7 @@ void mt76_connac_mcu_wtbl_smps_tlv(struct sk_buff *skb, |
| tlv = mt76_connac_mcu_add_nested_tlv(skb, WTBL_SMPS, sizeof(*smps), |
| wtbl_tlv, sta_wtbl); |
| smps = (struct wtbl_smps *)tlv; |
| - smps->smps = (sta->deflink.smps_mode == IEEE80211_SMPS_DYNAMIC); |
| + smps->smps = (sta->smps_mode == IEEE80211_SMPS_DYNAMIC); |
| } |
| EXPORT_SYMBOL_GPL(mt76_connac_mcu_wtbl_smps_tlv); |
| |
| @@ -950,27 +950,27 @@ void mt76_connac_mcu_wtbl_ht_tlv(struct mt76_dev *dev, struct sk_buff *skb, |
| struct tlv *tlv; |
| u32 flags = 0; |
| |
| - if (sta->deflink.ht_cap.ht_supported || sta->deflink.he_6ghz_capa.capa) { |
| + if (sta->ht_cap.ht_supported || sta->he_6ghz_capa.capa) { |
| tlv = mt76_connac_mcu_add_nested_tlv(skb, WTBL_HT, sizeof(*ht), |
| wtbl_tlv, sta_wtbl); |
| ht = (struct wtbl_ht *)tlv; |
| ht->ldpc = ht_ldpc && |
| - !!(sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_LDPC_CODING); |
| + !!(sta->ht_cap.cap & IEEE80211_HT_CAP_LDPC_CODING); |
| |
| - if (sta->deflink.ht_cap.ht_supported) { |
| - ht->af = sta->deflink.ht_cap.ampdu_factor; |
| - ht->mm = sta->deflink.ht_cap.ampdu_density; |
| + if (sta->ht_cap.ht_supported) { |
| + ht->af = sta->ht_cap.ampdu_factor; |
| + ht->mm = sta->ht_cap.ampdu_density; |
| } else { |
| - ht->af = le16_get_bits(sta->deflink.he_6ghz_capa.capa, |
| + ht->af = le16_get_bits(sta->he_6ghz_capa.capa, |
| IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP); |
| - ht->mm = le16_get_bits(sta->deflink.he_6ghz_capa.capa, |
| + ht->mm = le16_get_bits(sta->he_6ghz_capa.capa, |
| IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START); |
| } |
| |
| ht->ht = true; |
| } |
| |
| - if (sta->deflink.vht_cap.vht_supported || sta->deflink.he_6ghz_capa.capa) { |
| + if (sta->vht_cap.vht_supported || sta->he_6ghz_capa.capa) { |
| struct wtbl_vht *vht; |
| u8 af; |
| |
| @@ -979,18 +979,18 @@ void mt76_connac_mcu_wtbl_ht_tlv(struct mt76_dev *dev, struct sk_buff *skb, |
| sta_wtbl); |
| vht = (struct wtbl_vht *)tlv; |
| vht->ldpc = vht_ldpc && |
| - !!(sta->deflink.vht_cap.cap & IEEE80211_VHT_CAP_RXLDPC); |
| + !!(sta->vht_cap.cap & IEEE80211_VHT_CAP_RXLDPC); |
| vht->vht = true; |
| |
| af = FIELD_GET(IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK, |
| - sta->deflink.vht_cap.cap); |
| + sta->vht_cap.cap); |
| if (ht) |
| ht->af = max(ht->af, af); |
| } |
| |
| mt76_connac_mcu_wtbl_smps_tlv(skb, sta, sta_wtbl, wtbl_tlv); |
| |
| - if (is_connac_v1(dev) && sta->deflink.ht_cap.ht_supported) { |
| + if (is_connac_v1(dev) && sta->ht_cap.ht_supported) { |
| /* sgi */ |
| u32 msk = MT_WTBL_W5_SHORT_GI_20 | MT_WTBL_W5_SHORT_GI_40 | |
| MT_WTBL_W5_SHORT_GI_80 | MT_WTBL_W5_SHORT_GI_160; |
| @@ -1000,15 +1000,15 @@ void mt76_connac_mcu_wtbl_ht_tlv(struct mt76_dev *dev, struct sk_buff *skb, |
| sizeof(*raw), wtbl_tlv, |
| sta_wtbl); |
| |
| - if (sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_SGI_20) |
| + if (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20) |
| flags |= MT_WTBL_W5_SHORT_GI_20; |
| - if (sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_SGI_40) |
| + if (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40) |
| flags |= MT_WTBL_W5_SHORT_GI_40; |
| |
| - if (sta->deflink.vht_cap.vht_supported) { |
| - if (sta->deflink.vht_cap.cap & IEEE80211_VHT_CAP_SHORT_GI_80) |
| + if (sta->vht_cap.vht_supported) { |
| + if (sta->vht_cap.cap & IEEE80211_VHT_CAP_SHORT_GI_80) |
| flags |= MT_WTBL_W5_SHORT_GI_80; |
| - if (sta->deflink.vht_cap.cap & IEEE80211_VHT_CAP_SHORT_GI_160) |
| + if (sta->vht_cap.cap & IEEE80211_VHT_CAP_SHORT_GI_160) |
| flags |= MT_WTBL_W5_SHORT_GI_160; |
| } |
| raw = (struct wtbl_raw *)tlv; |
| @@ -1294,9 +1294,9 @@ u8 mt76_connac_get_phy_mode(struct mt76_phy *phy, struct ieee80211_vif *vif, |
| return 0x38; |
| |
| if (sta) { |
| - ht_cap = &sta->deflink.ht_cap; |
| - vht_cap = &sta->deflink.vht_cap; |
| - he_cap = &sta->deflink.he_cap; |
| + ht_cap = &sta->ht_cap; |
| + vht_cap = &sta->vht_cap; |
| + he_cap = &sta->he_cap; |
| } else { |
| struct ieee80211_supported_band *sband; |
| |
| @@ -1616,7 +1616,6 @@ int mt76_connac_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif, |
| for (i = 0; i < sreq->n_ssids; i++) { |
| if (!sreq->ssids[i].ssid_len) |
| continue; |
| - |
| req->ssids[i].ssid_len = cpu_to_le32(sreq->ssids[i].ssid_len); |
| memcpy(req->ssids[i].ssid, sreq->ssids[i].ssid, |
| sreq->ssids[i].ssid_len); |
| @@ -1749,7 +1748,6 @@ int mt76_connac_mcu_sched_scan_req(struct mt76_phy *phy, |
| memcpy(req->ssids[i].ssid, ssid->ssid, ssid->ssid_len); |
| req->ssids[i].ssid_len = cpu_to_le32(ssid->ssid_len); |
| } |
| - |
| req->match_num = sreq->n_match_sets; |
| for (i = 0; i < req->match_num; i++) { |
| match = &sreq->match_sets[i]; |
| @@ -2236,10 +2234,8 @@ int mt76_connac_mcu_update_arp_filter(struct mt76_dev *dev, |
| struct mt76_vif *vif, |
| struct ieee80211_bss_conf *info) |
| { |
| - struct ieee80211_vif *mvif = container_of(info, struct ieee80211_vif, |
| - bss_conf); |
| struct sk_buff *skb; |
| - int i, len = min_t(int, mvif->cfg.arp_addr_cnt, |
| + int i, len = min_t(int, info->arp_addr_cnt, |
| IEEE80211_BSS_ARP_ADDR_LIST_LEN); |
| struct { |
| struct { |
| @@ -2267,7 +2263,7 @@ int mt76_connac_mcu_update_arp_filter(struct mt76_dev *dev, |
| |
| skb_put_data(skb, &req_hdr, sizeof(req_hdr)); |
| for (i = 0; i < len; i++) |
| - skb_put_data(skb, &mvif->cfg.arp_addr_list[i], sizeof(__be32)); |
| + skb_put_data(skb, &info->arp_addr_list[i], sizeof(__be32)); |
| |
| return mt76_mcu_skb_send_msg(dev, skb, MCU_UNI_CMD(OFFLOAD), true); |
| } |
| diff --git a/mt76x02_mac.c b/mt76x02_mac.c |
| index d3f74473..87ea3db1 100644 |
| --- a/mt76x02_mac.c |
| +++ b/mt76x02_mac.c |
| @@ -404,7 +404,7 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi, |
| txwi->rate |= cpu_to_le16(MT_RXWI_RATE_LDPC); |
| if ((info->flags & IEEE80211_TX_CTL_STBC) && nss == 1) |
| txwi->rate |= cpu_to_le16(MT_RXWI_RATE_STBC); |
| - if (nss > 1 && sta && sta->deflink.smps_mode == IEEE80211_SMPS_DYNAMIC) |
| + if (nss > 1 && sta && sta->smps_mode == IEEE80211_SMPS_DYNAMIC) |
| txwi_flags |= MT_TXWI_FLAGS_MMPS; |
| if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) |
| txwi->ack_ctl |= MT_TXWI_ACK_CTL_REQ; |
| @@ -412,9 +412,9 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi, |
| txwi->ack_ctl |= MT_TXWI_ACK_CTL_NSEQ; |
| if ((info->flags & IEEE80211_TX_CTL_AMPDU) && sta) { |
| u8 ba_size = IEEE80211_MIN_AMPDU_BUF; |
| - u8 ampdu_density = sta->deflink.ht_cap.ampdu_density; |
| + u8 ampdu_density = sta->ht_cap.ampdu_density; |
| |
| - ba_size <<= sta->deflink.ht_cap.ampdu_factor; |
| + ba_size <<= sta->ht_cap.ampdu_factor; |
| ba_size = min_t(int, 63, ba_size - 1); |
| if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) |
| ba_size = 0; |
| diff --git a/mt7915/debugfs.c b/mt7915/debugfs.c |
| index f3b039ff..47c9dfdd 100644 |
| --- a/mt7915/debugfs.c |
| +++ b/mt7915/debugfs.c |
| @@ -1840,8 +1840,8 @@ static ssize_t mt7915_sta_fixed_rate_set(struct file *file, |
| |
| phy.ldpc = (phy.bw || phy.ldpc) * GENMASK(2, 0); |
| for (i = 0; i <= phy.bw; i++) { |
| - phy.sgi |= gi << (i << sta->deflink.he_cap.has_he); |
| - phy.he_ltf |= he_ltf << (i << sta->deflink.he_cap.has_he); |
| + phy.sgi |= gi << (i << sta->he_cap.has_he); |
| + phy.he_ltf |= he_ltf << (i << sta->he_cap.has_he); |
| } |
| field = RATE_PARAM_FIXED; |
| |
| diff --git a/mt7915/dma.c b/mt7915/dma.c |
| index 36260085..e3d4ebc4 100644 |
| --- a/mt7915/dma.c |
| +++ b/mt7915/dma.c |
| @@ -555,8 +555,8 @@ int mt7915_dma_init(struct mt7915_dev *dev, struct mt7915_phy *phy2) |
| if (ret < 0) |
| return ret; |
| |
| - netif_napi_add_tx(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi, |
| - mt7915_poll_tx); |
| + netif_tx_napi_add(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi, |
| + mt7915_poll_tx, NAPI_POLL_WEIGHT); |
| napi_enable(&dev->mt76.tx_napi); |
| |
| mt7915_dma_enable(dev); |
| diff --git a/mt7915/init.c b/mt7915/init.c |
| index c347509b..e643c0e4 100755 |
| --- a/mt7915/init.c |
| +++ b/mt7915/init.c |
| @@ -1148,8 +1148,7 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band, |
| mt7915_gen_ppe_thresh(he_cap->ppe_thres, nss); |
| } else { |
| he_cap_elem->phy_cap_info[9] |= |
| - u8_encode_bits(IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_16US, |
| - IEEE80211_HE_PHY_CAP9_NOMINAL_PKT_PADDING_MASK); |
| + IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US; |
| } |
| |
| if (band == NL80211_BAND_6GHZ) { |
| diff --git a/mt7915/mac.c b/mt7915/mac.c |
| index d5df73db..3bbe757c 100644 |
| --- a/mt7915/mac.c |
| +++ b/mt7915/mac.c |
| @@ -913,7 +913,7 @@ mt7915_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi) |
| u16 fc, tid; |
| u32 val; |
| |
| - if (!sta || !(sta->deflink.ht_cap.ht_supported || sta->deflink.he_cap.has_he)) |
| + if (!sta || !(sta->ht_cap.ht_supported || sta->he_cap.has_he)) |
| return; |
| |
| tid = le32_get_bits(txwi[1], MT_TXD1_TID); |
| diff --git a/mt7915/main.c b/mt7915/main.c |
| index dcf1583d..5d678df8 100644 |
| --- a/mt7915/main.c |
| +++ b/mt7915/main.c |
| @@ -503,7 +503,7 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed) |
| |
| static int |
| mt7915_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, |
| - unsigned int link_id, u16 queue, |
| + u16 queue, |
| const struct ieee80211_tx_queue_params *params) |
| { |
| struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv; |
| @@ -598,7 +598,7 @@ mt7915_update_bss_color(struct ieee80211_hw *hw, |
| static void mt7915_bss_info_changed(struct ieee80211_hw *hw, |
| struct ieee80211_vif *vif, |
| struct ieee80211_bss_conf *info, |
| - u64 changed) |
| + u32 changed) |
| { |
| struct mt7915_phy *phy = mt7915_hw_phy(hw); |
| struct mt7915_dev *dev = mt7915_hw_dev(hw); |
| @@ -618,7 +618,7 @@ static void mt7915_bss_info_changed(struct ieee80211_hw *hw, |
| } |
| |
| if (changed & BSS_CHANGED_ASSOC) |
| - mt7915_mcu_add_bss_info(phy, vif, vif->cfg.assoc); |
| + mt7915_mcu_add_bss_info(phy, vif, info->assoc); |
| |
| if (changed & BSS_CHANGED_ERP_CTS_PROT) |
| mt7915_mac_enable_rtscts(dev, vif, info->use_cts_prot); |
| @@ -1226,10 +1226,10 @@ static int mt7915_sta_set_txpwr(struct ieee80211_hw *hw, |
| { |
| struct mt7915_phy *phy = mt7915_hw_phy(hw); |
| struct mt7915_dev *dev = mt7915_hw_dev(hw); |
| - s16 txpower = sta->deflink.txpwr.power; |
| + s16 txpower = sta->txpwr.power; |
| int ret; |
| |
| - if (sta->deflink.txpwr.type == NL80211_TX_POWER_AUTOMATIC) |
| + if (sta->txpwr.type == NL80211_TX_POWER_AUTOMATIC) |
| txpower = 0; |
| |
| mutex_lock(&dev->mt76.mutex); |
| diff --git a/mt7915/mcu.c b/mt7915/mcu.c |
| index e08a96d9..3860051f 100644 |
| --- a/mt7915/mcu.c |
| +++ b/mt7915/mcu.c |
| @@ -64,7 +64,7 @@ mt7915_mcu_set_sta_he_mcs(struct ieee80211_sta *sta, __le16 *he_mcs, |
| struct mt7915_dev *dev = msta->vif->phy->dev; |
| enum nl80211_band band = msta->vif->phy->mt76->chandef.chan->band; |
| const u16 *mask = msta->vif->bitrate_mask.control[band].he_mcs; |
| - int nss, max_nss = sta->deflink.rx_nss > 3 ? 4 : sta->deflink.rx_nss; |
| + int nss, max_nss = sta->rx_nss > 3 ? 4 : sta->rx_nss; |
| |
| for (nss = 0; nss < max_nss; nss++) { |
| int mcs; |
| @@ -104,7 +104,7 @@ mt7915_mcu_set_sta_he_mcs(struct ieee80211_sta *sta, __le16 *he_mcs, |
| |
| /* only support 2ss on 160MHz for mt7915 */ |
| if (is_mt7915(&dev->mt76) && nss > 1 && |
| - sta->deflink.bandwidth == IEEE80211_STA_RX_BW_160) |
| + sta->bandwidth == IEEE80211_STA_RX_BW_160) |
| break; |
| } |
| |
| @@ -117,8 +117,8 @@ mt7915_mcu_set_sta_vht_mcs(struct ieee80211_sta *sta, __le16 *vht_mcs, |
| { |
| struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv; |
| struct mt7915_dev *dev = msta->vif->phy->dev; |
| - u16 mcs_map = le16_to_cpu(sta->deflink.vht_cap.vht_mcs.rx_mcs_map); |
| - int nss, max_nss = sta->deflink.rx_nss > 3 ? 4 : sta->deflink.rx_nss; |
| + u16 mcs_map = le16_to_cpu(sta->vht_cap.vht_mcs.rx_mcs_map); |
| + int nss, max_nss = sta->rx_nss > 3 ? 4 : sta->rx_nss; |
| u16 mcs; |
| |
| for (nss = 0; nss < max_nss; nss++, mcs_map >>= 2) { |
| @@ -140,7 +140,7 @@ mt7915_mcu_set_sta_vht_mcs(struct ieee80211_sta *sta, __le16 *vht_mcs, |
| |
| /* only support 2ss on 160MHz for mt7915 */ |
| if (is_mt7915(&dev->mt76) && nss > 1 && |
| - sta->deflink.bandwidth == IEEE80211_STA_RX_BW_160) |
| + sta->bandwidth == IEEE80211_STA_RX_BW_160) |
| break; |
| } |
| } |
| @@ -149,10 +149,10 @@ static void |
| mt7915_mcu_set_sta_ht_mcs(struct ieee80211_sta *sta, u8 *ht_mcs, |
| const u8 *mask) |
| { |
| - int nss, max_nss = sta->deflink.rx_nss > 3 ? 4 : sta->deflink.rx_nss; |
| + int nss, max_nss = sta->rx_nss > 3 ? 4 : sta->rx_nss; |
| |
| for (nss = 0; nss < max_nss; nss++) |
| - ht_mcs[nss] = sta->deflink.ht_cap.mcs.rx_mask[nss] & mask[nss]; |
| + ht_mcs[nss] = sta->ht_cap.mcs.rx_mask[nss] & mask[nss]; |
| } |
| |
| static int |
| @@ -230,7 +230,7 @@ int mt7915_mcu_wa_cmd(struct mt7915_dev *dev, int cmd, u32 a1, u32 a2, u32 a3) |
| static void |
| mt7915_mcu_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif) |
| { |
| - if (vif->bss_conf.csa_active) |
| + if (vif->csa_active) |
| ieee80211_csa_finish(vif); |
| } |
| |
| @@ -331,7 +331,7 @@ mt7915_mcu_rx_log_message(struct mt7915_dev *dev, struct sk_buff *skb) |
| static void |
| mt7915_mcu_cca_finish(void *priv, u8 *mac, struct ieee80211_vif *vif) |
| { |
| - if (!vif->bss_conf.color_change_active) |
| + if (!vif->color_change_active) |
| return; |
| |
| ieee80211_color_change_finish(vif); |
| @@ -731,13 +731,13 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta, |
| struct ieee80211_vif *vif) |
| { |
| struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv; |
| - struct ieee80211_he_cap_elem *elem = &sta->deflink.he_cap.he_cap_elem; |
| + struct ieee80211_he_cap_elem *elem = &sta->he_cap.he_cap_elem; |
| struct ieee80211_he_mcs_nss_supp mcs_map; |
| struct sta_rec_he *he; |
| struct tlv *tlv; |
| u32 cap = 0; |
| |
| - if (!sta->deflink.he_cap.has_he) |
| + if (!sta->he_cap.has_he) |
| return; |
| |
| tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HE, sizeof(*he)); |
| @@ -823,8 +823,8 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta, |
| |
| he->he_cap = cpu_to_le32(cap); |
| |
| - mcs_map = sta->deflink.he_cap.he_mcs_nss_supp; |
| - switch (sta->deflink.bandwidth) { |
| + mcs_map = sta->he_cap.he_mcs_nss_supp; |
| + switch (sta->bandwidth) { |
| case IEEE80211_STA_RX_BW_160: |
| if (elem->phy_cap_info[0] & |
| IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G) |
| @@ -874,7 +874,7 @@ mt7915_mcu_sta_muru_tlv(struct mt7915_dev *dev, struct sk_buff *skb, |
| struct ieee80211_sta *sta, struct ieee80211_vif *vif) |
| { |
| struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv; |
| - struct ieee80211_he_cap_elem *elem = &sta->deflink.he_cap.he_cap_elem; |
| + struct ieee80211_he_cap_elem *elem = &sta->he_cap.he_cap_elem; |
| struct sta_rec_muru *muru; |
| struct tlv *tlv; |
| |
| @@ -898,11 +898,11 @@ mt7915_mcu_sta_muru_tlv(struct mt7915_dev *dev, struct sk_buff *skb, |
| muru->cfg.ofdma_dl_en = !!(dev->dbg.muru_onoff & OFDMA_DL); |
| muru->cfg.ofdma_ul_en = !!(dev->dbg.muru_onoff & OFDMA_UL); |
| |
| - if (sta->deflink.vht_cap.vht_supported) |
| + if (sta->vht_cap.vht_supported) |
| muru->mimo_dl.vht_mu_bfee = |
| - !!(sta->deflink.vht_cap.cap & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE); |
| + !!(sta->vht_cap.cap & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE); |
| |
| - if (!sta->deflink.he_cap.has_he) |
| + if (!sta->he_cap.has_he) |
| return; |
| |
| muru->mimo_dl.partial_bw_dl_mimo = |
| @@ -936,13 +936,13 @@ mt7915_mcu_sta_ht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta) |
| struct sta_rec_ht *ht; |
| struct tlv *tlv; |
| |
| - if (!sta->deflink.ht_cap.ht_supported) |
| + if (!sta->ht_cap.ht_supported) |
| return; |
| |
| tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HT, sizeof(*ht)); |
| |
| ht = (struct sta_rec_ht *)tlv; |
| - ht->ht_cap = cpu_to_le16(sta->deflink.ht_cap.cap); |
| + ht->ht_cap = cpu_to_le16(sta->ht_cap.cap); |
| } |
| |
| static void |
| @@ -951,15 +951,15 @@ mt7915_mcu_sta_vht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta) |
| struct sta_rec_vht *vht; |
| struct tlv *tlv; |
| |
| - if (!sta->deflink.vht_cap.vht_supported) |
| + if (!sta->vht_cap.vht_supported) |
| return; |
| |
| tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_VHT, sizeof(*vht)); |
| |
| vht = (struct sta_rec_vht *)tlv; |
| - vht->vht_cap = cpu_to_le32(sta->deflink.vht_cap.cap); |
| - vht->vht_rx_mcs_map = sta->deflink.vht_cap.vht_mcs.rx_mcs_map; |
| - vht->vht_tx_mcs_map = sta->deflink.vht_cap.vht_mcs.tx_mcs_map; |
| + vht->vht_cap = cpu_to_le32(sta->vht_cap.cap); |
| + vht->vht_rx_mcs_map = sta->vht_cap.vht_mcs.rx_mcs_map; |
| + vht->vht_tx_mcs_map = sta->vht_cap.vht_mcs.tx_mcs_map; |
| } |
| |
| static void |
| @@ -974,7 +974,7 @@ mt7915_mcu_sta_amsdu_tlv(struct mt7915_dev *dev, struct sk_buff *skb, |
| vif->type != NL80211_IFTYPE_AP) |
| return; |
| |
| - if (!sta->deflink.agg.max_amsdu_len) |
| + if (!sta->max_amsdu_len) |
| return; |
| |
| tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HW_AMSDU, sizeof(*amsdu)); |
| @@ -983,7 +983,7 @@ mt7915_mcu_sta_amsdu_tlv(struct mt7915_dev *dev, struct sk_buff *skb, |
| amsdu->amsdu_en = true; |
| msta->wcid.amsdu = true; |
| |
| - switch (sta->deflink.agg.max_amsdu_len) { |
| + switch (sta->max_amsdu_len) { |
| case IEEE80211_MAX_MPDU_LEN_VHT_11454: |
| if (!is_mt7915(&dev->mt76)) { |
| amsdu->max_mpdu_size = |
| @@ -1046,8 +1046,8 @@ mt7915_is_ebf_supported(struct mt7915_phy *phy, struct ieee80211_vif *vif, |
| if (!bfee && tx_ant < 2) |
| return false; |
| |
| - if (sta->deflink.he_cap.has_he) { |
| - struct ieee80211_he_cap_elem *pe = &sta->deflink.he_cap.he_cap_elem; |
| + if (sta->he_cap.has_he) { |
| + struct ieee80211_he_cap_elem *pe = &sta->he_cap.he_cap_elem; |
| |
| if (bfee) |
| return mvif->cap.he_su_ebfee && |
| @@ -1057,8 +1057,8 @@ mt7915_is_ebf_supported(struct mt7915_phy *phy, struct ieee80211_vif *vif, |
| HE_PHY(CAP4_SU_BEAMFORMEE, pe->phy_cap_info[4]); |
| } |
| |
| - if (sta->deflink.vht_cap.vht_supported) { |
| - u32 cap = sta->deflink.vht_cap.cap; |
| + if (sta->vht_cap.vht_supported) { |
| + u32 cap = sta->vht_cap.cap; |
| |
| if (bfee) |
| return mvif->cap.vht_su_ebfee && |
| @@ -1084,7 +1084,7 @@ static void |
| mt7915_mcu_sta_bfer_ht(struct ieee80211_sta *sta, struct mt7915_phy *phy, |
| struct sta_rec_bf *bf) |
| { |
| - struct ieee80211_mcs_info *mcs = &sta->deflink.ht_cap.mcs; |
| + struct ieee80211_mcs_info *mcs = &sta->ht_cap.mcs; |
| u8 n = 0; |
| |
| bf->tx_mode = MT_PHY_TYPE_HT; |
| @@ -1109,7 +1109,7 @@ static void |
| mt7915_mcu_sta_bfer_vht(struct ieee80211_sta *sta, struct mt7915_phy *phy, |
| struct sta_rec_bf *bf, bool explicit) |
| { |
| - struct ieee80211_sta_vht_cap *pc = &sta->deflink.vht_cap; |
| + struct ieee80211_sta_vht_cap *pc = &sta->vht_cap; |
| struct ieee80211_sta_vht_cap *vc = &phy->mt76->sband_5g.sband.vht_cap; |
| u16 mcs_map = le16_to_cpu(pc->vht_mcs.rx_mcs_map); |
| u8 nss_mcs = mt7915_mcu_get_sta_nss(mcs_map); |
| @@ -1130,14 +1130,14 @@ mt7915_mcu_sta_bfer_vht(struct ieee80211_sta *sta, struct mt7915_phy *phy, |
| bf->ncol = min_t(u8, nss_mcs, bf->nrow); |
| bf->ibf_ncol = bf->ncol; |
| |
| - if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_160) |
| + if (sta->bandwidth == IEEE80211_STA_RX_BW_160) |
| bf->nrow = 1; |
| } else { |
| bf->nrow = tx_ant; |
| bf->ncol = min_t(u8, nss_mcs, bf->nrow); |
| bf->ibf_ncol = nss_mcs; |
| |
| - if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_160) |
| + if (sta->bandwidth == IEEE80211_STA_RX_BW_160) |
| bf->ibf_nrow = 1; |
| } |
| } |
| @@ -1146,7 +1146,7 @@ static void |
| mt7915_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif, |
| struct mt7915_phy *phy, struct sta_rec_bf *bf) |
| { |
| - struct ieee80211_sta_he_cap *pc = &sta->deflink.he_cap; |
| + struct ieee80211_sta_he_cap *pc = &sta->he_cap; |
| struct ieee80211_he_cap_elem *pe = &pc->he_cap_elem; |
| const struct ieee80211_sta_he_cap *vc = |
| mt76_connac_get_he_phy_cap(phy->mt76, vif); |
| @@ -1171,7 +1171,7 @@ mt7915_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif, |
| bf->ncol = min_t(u8, nss_mcs, bf->nrow); |
| bf->ibf_ncol = bf->ncol; |
| |
| - if (sta->deflink.bandwidth != IEEE80211_STA_RX_BW_160) |
| + if (sta->bandwidth != IEEE80211_STA_RX_BW_160) |
| return; |
| |
| /* go over for 160MHz and 80p80 */ |
| @@ -1219,7 +1219,7 @@ mt7915_mcu_sta_bfer_tlv(struct mt7915_dev *dev, struct sk_buff *skb, |
| }; |
| bool ebf; |
| |
| - if (!(sta->deflink.ht_cap.ht_supported || sta->deflink.he_cap.has_he)) |
| + if (!(sta->ht_cap.ht_supported || sta->he_cap.has_he)) |
| return; |
| |
| ebf = mt7915_is_ebf_supported(phy, vif, sta, false); |
| @@ -1233,21 +1233,21 @@ mt7915_mcu_sta_bfer_tlv(struct mt7915_dev *dev, struct sk_buff *skb, |
| * vht: support eBF and iBF |
| * ht: iBF only, since mac80211 lacks of eBF support |
| */ |
| - if (sta->deflink.he_cap.has_he && ebf) |
| + if (sta->he_cap.has_he && ebf) |
| mt7915_mcu_sta_bfer_he(sta, vif, phy, bf); |
| - else if (sta->deflink.vht_cap.vht_supported) |
| + else if (sta->vht_cap.vht_supported) |
| mt7915_mcu_sta_bfer_vht(sta, phy, bf, ebf); |
| - else if (sta->deflink.ht_cap.ht_supported) |
| + else if (sta->ht_cap.ht_supported) |
| mt7915_mcu_sta_bfer_ht(sta, phy, bf); |
| else |
| return; |
| |
| bf->bf_cap = ebf ? ebf : dev->ibf << 1; |
| - bf->bw = sta->deflink.bandwidth; |
| - bf->ibf_dbw = sta->deflink.bandwidth; |
| + bf->bw = sta->bandwidth; |
| + bf->ibf_dbw = sta->bandwidth; |
| bf->ibf_nrow = tx_ant; |
| |
| - if (!ebf && sta->deflink.bandwidth <= IEEE80211_STA_RX_BW_40 && !bf->ncol) |
| + if (!ebf && sta->bandwidth <= IEEE80211_STA_RX_BW_40 && !bf->ncol) |
| bf->ibf_timeout = 0x48; |
| else |
| bf->ibf_timeout = 0x18; |
| @@ -1257,7 +1257,7 @@ mt7915_mcu_sta_bfer_tlv(struct mt7915_dev *dev, struct sk_buff *skb, |
| else |
| bf->mem_20m = matrix[bf->nrow][bf->ncol]; |
| |
| - switch (sta->deflink.bandwidth) { |
| + switch (sta->bandwidth) { |
| case IEEE80211_STA_RX_BW_160: |
| case IEEE80211_STA_RX_BW_80: |
| bf->mem_total = bf->mem_20m * 2; |
| @@ -1282,7 +1282,7 @@ mt7915_mcu_sta_bfee_tlv(struct mt7915_dev *dev, struct sk_buff *skb, |
| struct tlv *tlv; |
| u8 nrow = 0; |
| |
| - if (!(sta->deflink.vht_cap.vht_supported || sta->deflink.he_cap.has_he)) |
| + if (!(sta->vht_cap.vht_supported || sta->he_cap.has_he)) |
| return; |
| |
| if (!mt7915_is_ebf_supported(phy, vif, sta, true)) |
| @@ -1291,13 +1291,13 @@ mt7915_mcu_sta_bfee_tlv(struct mt7915_dev *dev, struct sk_buff *skb, |
| tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_BFEE, sizeof(*bfee)); |
| bfee = (struct sta_rec_bfee *)tlv; |
| |
| - if (sta->deflink.he_cap.has_he) { |
| - struct ieee80211_he_cap_elem *pe = &sta->deflink.he_cap.he_cap_elem; |
| + if (sta->he_cap.has_he) { |
| + struct ieee80211_he_cap_elem *pe = &sta->he_cap.he_cap_elem; |
| |
| nrow = HE_PHY(CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK, |
| pe->phy_cap_info[5]); |
| - } else if (sta->deflink.vht_cap.vht_supported) { |
| - struct ieee80211_sta_vht_cap *pc = &sta->deflink.vht_cap; |
| + } else if (sta->vht_cap.vht_supported) { |
| + struct ieee80211_sta_vht_cap *pc = &sta->vht_cap; |
| |
| nrow = FIELD_GET(IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK, |
| pc->cap); |
| @@ -1353,7 +1353,7 @@ int mt7915_mcu_set_fixed_rate_ctrl(struct mt7915_dev *dev, |
| ra->phy = *phy; |
| break; |
| case RATE_PARAM_MMPS_UPDATE: |
| - ra->mmps_mode = mt7915_mcu_get_mmps_mode(sta->deflink.smps_mode); |
| + ra->mmps_mode = mt7915_mcu_get_mmps_mode(sta->smps_mode); |
| break; |
| case RATE_PARAM_SPE_UPDATE: |
| ra->spe_idx = *(u8 *)data; |
| @@ -1428,7 +1428,7 @@ mt7915_mcu_add_rate_ctrl_fixed(struct mt7915_dev *dev, |
| do { \ |
| u8 i, gi = mask->control[band]._gi; \ |
| gi = (_he) ? gi : gi == NL80211_TXRATE_FORCE_SGI; \ |
| - for (i = 0; i <= sta->deflink.bandwidth; i++) { \ |
| + for (i = 0; i <= sta->bandwidth; i++) { \ |
| phy.sgi |= gi << (i << (_he)); \ |
| phy.he_ltf |= mask->control[band].he_ltf << (i << (_he));\ |
| } \ |
| @@ -1442,11 +1442,11 @@ mt7915_mcu_add_rate_ctrl_fixed(struct mt7915_dev *dev, |
| } \ |
| } while (0) |
| |
| - if (sta->deflink.he_cap.has_he) { |
| + if (sta->he_cap.has_he) { |
| __sta_phy_bitrate_mask_check(he_mcs, he_gi, 0, 1); |
| - } else if (sta->deflink.vht_cap.vht_supported) { |
| + } else if (sta->vht_cap.vht_supported) { |
| __sta_phy_bitrate_mask_check(vht_mcs, gi, 0, 0); |
| - } else if (sta->deflink.ht_cap.ht_supported) { |
| + } else if (sta->ht_cap.ht_supported) { |
| __sta_phy_bitrate_mask_check(ht_mcs, gi, 1, 0); |
| } else { |
| nrates = hweight32(mask->control[band].legacy); |
| @@ -1480,7 +1480,7 @@ mt7915_mcu_add_rate_ctrl_fixed(struct mt7915_dev *dev, |
| * actual txrate hardware sends out. |
| */ |
| addr = mt7915_mac_wtbl_lmac_addr(dev, msta->wcid.idx, 7); |
| - if (sta->deflink.he_cap.has_he) |
| + if (sta->he_cap.has_he) |
| mt76_rmw_field(dev, addr, GENMASK(31, 24), phy.sgi); |
| else |
| mt76_rmw_field(dev, addr, GENMASK(15, 12), phy.sgi); |
| @@ -1513,7 +1513,7 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb, struct mt7915_dev *dev, |
| enum nl80211_band band = chandef->chan->band; |
| struct sta_rec_ra *ra; |
| struct tlv *tlv; |
| - u32 supp_rate = sta->deflink.supp_rates[band]; |
| + u32 supp_rate = sta->supp_rates[band]; |
| u32 cap = sta->wme ? STA_CAP_WMM : 0; |
| |
| tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_RA, sizeof(*ra)); |
| @@ -1523,9 +1523,9 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb, struct mt7915_dev *dev, |
| ra->auto_rate = true; |
| ra->phy_mode = mt76_connac_get_phy_mode(mphy, vif, band, sta); |
| ra->channel = chandef->chan->hw_value; |
| - ra->bw = sta->deflink.bandwidth; |
| - ra->phy.bw = sta->deflink.bandwidth; |
| - ra->mmps_mode = mt7915_mcu_get_mmps_mode(sta->deflink.smps_mode); |
| + ra->bw = sta->bandwidth; |
| + ra->phy.bw = sta->bandwidth; |
| + ra->mmps_mode = mt7915_mcu_get_mmps_mode(sta->smps_mode); |
| |
| if (supp_rate) { |
| supp_rate &= mask->control[band].legacy; |
| @@ -1545,22 +1545,22 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb, struct mt7915_dev *dev, |
| } |
| } |
| |
| - if (sta->deflink.ht_cap.ht_supported) { |
| + if (sta->ht_cap.ht_supported) { |
| ra->supp_mode |= MODE_HT; |
| - ra->af = sta->deflink.ht_cap.ampdu_factor; |
| - ra->ht_gf = !!(sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_GRN_FLD); |
| + ra->af = sta->ht_cap.ampdu_factor; |
| + ra->ht_gf = !!(sta->ht_cap.cap & IEEE80211_HT_CAP_GRN_FLD); |
| |
| cap |= STA_CAP_HT; |
| - if (sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_SGI_20) |
| + if (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20) |
| cap |= STA_CAP_SGI_20; |
| - if (sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_SGI_40) |
| + if (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40) |
| cap |= STA_CAP_SGI_40; |
| - if (sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_TX_STBC) |
| + if (sta->ht_cap.cap & IEEE80211_HT_CAP_TX_STBC) |
| cap |= STA_CAP_TX_STBC; |
| - if (sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_RX_STBC) |
| + if (sta->ht_cap.cap & IEEE80211_HT_CAP_RX_STBC) |
| cap |= STA_CAP_RX_STBC; |
| if (mvif->cap.ht_ldpc && |
| - (sta->deflink.ht_cap.cap & IEEE80211_HT_CAP_LDPC_CODING)) |
| + (sta->ht_cap.cap & IEEE80211_HT_CAP_LDPC_CODING)) |
| cap |= STA_CAP_LDPC; |
| |
| mt7915_mcu_set_sta_ht_mcs(sta, ra->ht_mcs, |
| @@ -1568,37 +1568,37 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb, struct mt7915_dev *dev, |
| ra->supp_ht_mcs = *(__le32 *)ra->ht_mcs; |
| } |
| |
| - if (sta->deflink.vht_cap.vht_supported) { |
| + if (sta->vht_cap.vht_supported) { |
| u8 af; |
| |
| ra->supp_mode |= MODE_VHT; |
| af = FIELD_GET(IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK, |
| - sta->deflink.vht_cap.cap); |
| + sta->vht_cap.cap); |
| ra->af = max_t(u8, ra->af, af); |
| |
| cap |= STA_CAP_VHT; |
| - if (sta->deflink.vht_cap.cap & IEEE80211_VHT_CAP_SHORT_GI_80) |
| + if (sta->vht_cap.cap & IEEE80211_VHT_CAP_SHORT_GI_80) |
| cap |= STA_CAP_VHT_SGI_80; |
| - if (sta->deflink.vht_cap.cap & IEEE80211_VHT_CAP_SHORT_GI_160) |
| + if (sta->vht_cap.cap & IEEE80211_VHT_CAP_SHORT_GI_160) |
| cap |= STA_CAP_VHT_SGI_160; |
| - if (sta->deflink.vht_cap.cap & IEEE80211_VHT_CAP_TXSTBC) |
| + if (sta->vht_cap.cap & IEEE80211_VHT_CAP_TXSTBC) |
| cap |= STA_CAP_VHT_TX_STBC; |
| - if (sta->deflink.vht_cap.cap & IEEE80211_VHT_CAP_RXSTBC_1) |
| + if (sta->vht_cap.cap & IEEE80211_VHT_CAP_RXSTBC_1) |
| cap |= STA_CAP_VHT_RX_STBC; |
| if (mvif->cap.vht_ldpc && |
| - (sta->deflink.vht_cap.cap & IEEE80211_VHT_CAP_RXLDPC)) |
| + (sta->vht_cap.cap & IEEE80211_VHT_CAP_RXLDPC)) |
| cap |= STA_CAP_VHT_LDPC; |
| |
| mt7915_mcu_set_sta_vht_mcs(sta, ra->supp_vht_mcs, |
| mask->control[band].vht_mcs); |
| } |
| |
| - if (sta->deflink.he_cap.has_he) { |
| + if (sta->he_cap.has_he) { |
| ra->supp_mode |= MODE_HE; |
| cap |= STA_CAP_HE; |
| |
| - if (sta->deflink.he_6ghz_capa.capa) |
| - ra->af = le16_get_bits(sta->deflink.he_6ghz_capa.capa, |
| + if (sta->he_6ghz_capa.capa) |
| + ra->af = le16_get_bits(sta->he_6ghz_capa.capa, |
| IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP); |
| } |
| |
| @@ -1807,7 +1807,7 @@ mt7915_mcu_beacon_cntdwn(struct ieee80211_vif *vif, struct sk_buff *rskb, |
| if (!offs->cntdwn_counter_offs[0]) |
| return; |
| |
| - sub_tag = vif->bss_conf.csa_active ? BSS_INFO_BCN_CSA : BSS_INFO_BCN_BCC; |
| + sub_tag = vif->csa_active ? BSS_INFO_BCN_CSA : BSS_INFO_BCN_BCC; |
| tlv = mt7915_mcu_add_nested_subtlv(rskb, sub_tag, sizeof(*info), |
| &bcn->sub_ntlv, &bcn->len); |
| info = (struct bss_info_bcn_cntdwn *)tlv; |
| @@ -1892,9 +1892,9 @@ mt7915_mcu_beacon_cont(struct mt7915_dev *dev, struct ieee80211_vif *vif, |
| if (offs->cntdwn_counter_offs[0]) { |
| u16 offset = offs->cntdwn_counter_offs[0]; |
| |
| - if (vif->bss_conf.csa_active) |
| + if (vif->csa_active) |
| cont->csa_ofs = cpu_to_le16(offset - 4); |
| - if (vif->bss_conf.color_change_active) |
| + if (vif->color_change_active) |
| cont->bcc_ofs = cpu_to_le16(offset - 3); |
| } |
| |
| @@ -2078,7 +2078,7 @@ int mt7915_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif, |
| if (!en) |
| goto out; |
| |
| - skb = ieee80211_beacon_get_template(hw, vif, &offs, 0); |
| + skb = ieee80211_beacon_get_template(hw, vif, &offs); |
| if (!skb) |
| return -EINVAL; |
| |
| @@ -3279,17 +3279,17 @@ int mt7915_mcu_set_txpower_frame(struct mt7915_phy *phy, |
| if (txpower) { |
| u32 offs, len, i; |
| |
| - if (sta->deflink.ht_cap.ht_supported) { |
| + if (sta->ht_cap.ht_supported) { |
| const u8 *sku_len = mt7915_sku_group_len; |
| |
| offs = sku_len[SKU_CCK] + sku_len[SKU_OFDM]; |
| len = sku_len[SKU_HT_BW20] + sku_len[SKU_HT_BW40]; |
| |
| - if (sta->deflink.vht_cap.vht_supported) { |
| + if (sta->vht_cap.vht_supported) { |
| offs += len; |
| len = sku_len[SKU_VHT_BW20] * 4; |
| |
| - if (sta->deflink.he_cap.has_he) { |
| + if (sta->he_cap.has_he) { |
| offs += len + sku_len[SKU_HE_RU26] * 3; |
| len = sku_len[SKU_HE_RU242] * 4; |
| } |
| diff --git a/mt7915/testmode.c b/mt7915/testmode.c |
| index 2ae6c07f..75be1ed9 100644 |
| --- a/mt7915/testmode.c |
| +++ b/mt7915/testmode.c |
| @@ -360,12 +360,12 @@ mt7915_tm_entry_add(struct mt7915_phy *phy, u8 aid) |
| } |
| |
| if (td->tx_rate_mode >= MT76_TM_TX_MODE_HT) |
| - memcpy(&sta->deflink.ht_cap, &sband->ht_cap, sizeof(sta->deflink.ht_cap)); |
| + memcpy(&sta->ht_cap, &sband->ht_cap, sizeof(sta->ht_cap)); |
| if (td->tx_rate_mode >= MT76_TM_TX_MODE_VHT) |
| - memcpy(&sta->deflink.vht_cap, &sband->vht_cap, sizeof(sta->deflink.vht_cap)); |
| + memcpy(&sta->vht_cap, &sband->vht_cap, sizeof(sta->vht_cap)); |
| if (td->tx_rate_mode >= MT76_TM_TX_MODE_HE_SU) |
| - memcpy(&sta->deflink.he_cap, &sdata[NL80211_IFTYPE_STATION].he_cap, |
| - sizeof(sta->deflink.he_cap)); |
| + memcpy(&sta->he_cap, &sdata[NL80211_IFTYPE_STATION].he_cap, |
| + sizeof(sta->he_cap)); |
| sta->aid = aid; |
| sta->wme = 1; |
| |
| diff --git a/tx.c b/tx.c |
| index 6d55566f..91c8dd8d 100644 |
| --- a/tx.c |
| +++ b/tx.c |
| @@ -60,20 +60,15 @@ mt76_tx_status_unlock(struct mt76_dev *dev, struct sk_buff_head *list) |
| .skb = skb, |
| .info = IEEE80211_SKB_CB(skb), |
| }; |
| - struct ieee80211_rate_status rs = {}; |
| struct mt76_tx_cb *cb = mt76_tx_skb_cb(skb); |
| struct mt76_wcid *wcid; |
| |
| wcid = rcu_dereference(dev->wcid[cb->wcid]); |
| if (wcid) { |
| status.sta = wcid_to_sta(wcid); |
| - if (status.sta && (wcid->rate.flags || wcid->rate.legacy)) { |
| - rs.rate_idx = wcid->rate; |
| - status.rates = &rs; |
| - status.n_rates = 1; |
| - } else { |
| - status.n_rates = 0; |
| - } |
| + |
| + if (status.sta) |
| + status.rate = &wcid->rate; |
| } |
| |
| hw = mt76_tx_status_get_hw(dev, skb); |
| -- |
| 2.25.1 |
| |