mt76: mt7615: fix using VHT STBC rates
Subsystems (2)
Felix Fietkau
maintainerPATCH 1/4 mt76: mt7615: fix using VHT STBC rates
The hardware expects MT_TX_RATE_NSS to be filled with the number of space/time streams. For non-STBC rates, this is equal to nss. For 1-stream STBC, this needs to be set to 2.
This is relevant for VHT rates only, on HT, the value is derived from MCS internally.
Signed-off-by Felix Fietkau <[email protected]>
--- .../net/wireless/mediatek/mt76/mt7615/mac.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +12 -6
@@ -254,7 +254,7 @@ mt7615_mac_tx_rate_val(struct mt7615_dev *dev, bool stbc, u8 *bw) { u8 phy, nss, rate_idx; -u16 rateval; +u16 rateval =0 ; *bw =0 ;
@@ -292,12 +292,14 @@ mt7615_mac_tx_rate_val(struct mt7615_dev *dev, rate_idx = val &0xff ; } - rateval = (FIELD_PREP (MT_TX_RATE_IDX , rate_idx) | -FIELD_PREP (MT_TX_RATE_MODE , phy) | -FIELD_PREP (MT_TX_RATE_NSS , nss -1 )); - -if (stbc && nss ==1 ) +if (stbc && nss ==1 ) { + nss++; rateval |=MT_TX_RATE_STBC ; + } + + rateval |= (FIELD_PREP (MT_TX_RATE_IDX , rate_idx) | +FIELD_PREP (MT_TX_RATE_MODE , phy) | +FIELD_PREP (MT_TX_RATE_NSS , nss -1 ));return rateval; }
@@ -771,6 +773,10 @@ static bool mt7615_fill_txs(struct mt7615_dev *dev, struct mt7615_sta *sta,break ;case MT_PHY_TYPE_VHT : final_nss =FIELD_GET (MT_TX_RATE_NSS , final_rate); + +if ((final_rate &MT_TX_RATE_STBC ) && final_nss) + final_nss--; + final_rate_flags |=IEEE80211_TX_RC_VHT_MCS ; final_rate = (final_rate &MT_TX_RATE_IDX ) | (final_nss <<4 );break ;
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 2/4 mt76: mt7615: fix PS buffering of action frames
Bufferable management frames need to be put in the data queue, otherwise they will not be buffered when the receiver is asleep.
Signed-off-by Felix Fietkau <[email protected]>
--- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +1 -1
@@ -334,7 +334,7 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi, fc_type = (le16_to_cpu (fc) &IEEE80211_FCTL_FTYPE ) >>2 ; fc_stype = (le16_to_cpu (fc) &IEEE80211_FCTL_STYPE ) >>4 ; -if (ieee80211_is_data (fc)) { +if (ieee80211_is_data (fc) ||ieee80211_is_bufferable_mmpdu (fc)) { q_idx =skb_get_queue_mapping (skb); p_fmt =MT_TX_TYPE_CT ; }else if (ieee80211_is_beacon (fc)) {
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 3/4 mt76: mt7615: fix invalid fallback rates
In reply to Felix FietkauOnly decrement the rate index on duplicate rates if it is not already 0
Signed-off-by Felix Fietkau <[email protected]>
--- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +3 -0
@@ -503,6 +503,9 @@ void mt7615_mac_set_rates(struct mt7615_dev *dev, struct mt7615_sta *sta, IEEE80211_TX_RC_160_MHZ_WIDTH))continue ; +if (!rates[i].idx) +continue ; + rates[i].idx--; }
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 4/4 mt76: mt7603: fix invalid fallback rates
In reply to Felix FietkauOnly decrement the rate index on duplicate rates if it is not already 0
Signed-off-by Felix Fietkau <[email protected]>
--- drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +3 -0
@@ -639,6 +639,9 @@ void mt7603_wtbl_set_rates(struct mt7603_dev *dev, struct mt7603_sta *sta, IEEE80211_TX_RC_40_MHZ_WIDTH)continue ; +if (!rates[i].idx) +continue ; + rates[i].idx--; }
Signature · 1 line
2.17.0