mt76: mt7915: update max_mpdu_size in mt7915_mcu_sta_amsdu_tlv()
Subsystems (2)
PATCH v2 1/1 mt76: mt7915: update max_mpdu_size in mt7915_mcu_sta_amsdu_tlv()
The maximum max_mpdu_size of mt7915 is 7991, whereas mt7916 can support 11454.
Reviewed-by Ryder Lee <[email protected]>
Signed-off-by Peter Chiu <[email protected]>
---
v2:
update commit message
--- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +20 -5
@@ -986,8 +986,8 @@ mt7915_mcu_sta_vht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta) }static void -mt7915_mcu_sta_amsdu_tlv (struct sk_buff *skb,struct ieee80211_vif *vif, -struct ieee80211_sta *sta) +mt7915_mcu_sta_amsdu_tlv (struct mt7915_dev *dev,struct sk_buff *skb, +struct ieee80211_vif *vif,struct ieee80211_sta *sta) {struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv;struct sta_rec_amsdu *amsdu;
@@ -1004,9 +1004,24 @@ mt7915_mcu_sta_amsdu_tlv(struct sk_buff *skb, struct ieee80211_vif *vif, amsdu = (struct sta_rec_amsdu *)tlv; amsdu->max_amsdu_num =8 ; amsdu->amsdu_en = true; - amsdu->max_mpdu_size = sta->max_amsdu_len >= -IEEE80211_MAX_MPDU_LEN_VHT_7991 ; msta->wcid.amsdu = true; + +switch (sta->max_amsdu_len) { +case IEEE80211_MAX_MPDU_LEN_VHT_11454 : +if (!is_mt7915 (&dev->mt76)) { + amsdu->max_mpdu_size = +IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 ; +return ; + } + fallthrough; +case IEEE80211_MAX_MPDU_LEN_HT_7935 : +case IEEE80211_MAX_MPDU_LEN_VHT_7991 : + amsdu->max_mpdu_size =IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 ; +return ; +default : + amsdu->max_mpdu_size =IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895 ; +return ; + } } static int
@@ -1686,7 +1701,7 @@ int mt7915_mcu_add_sta(struct mt7915_dev *dev, struct ieee80211_vif *vif,if (sta && sta->ht_cap.ht_supported) {/* starec amsdu */ -mt7915_mcu_sta_amsdu_tlv (skb, vif, sta); +mt7915_mcu_sta_amsdu_tlv (dev, skb, vif, sta);/* starec he */ mt7915_mcu_sta_he_tlv (skb, sta, vif);/* starec muru */
Signature · 1 line
2.29.2