diff options
author | David S. Miller <davem@davemloft.net> | 2020-09-25 22:14:15 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-09-25 22:14:15 +0200 |
commit | 4e1b469ab0c2c6e6611a0af9f88c7745250dbf64 (patch) | |
tree | 05072420db180dcbda5133eba61efccbdb5b6b7a /drivers | |
parent | tcp: skip DSACKs with dubious sequence ranges (diff) | |
parent | mt76: mt7615: reduce maximum VHT MPDU length to 7991 (diff) | |
download | linux-4e1b469ab0c2c6e6611a0af9f88c7745250dbf64.tar.xz linux-4e1b469ab0c2c6e6611a0af9f88c7745250dbf64.zip |
Merge tag 'wireless-drivers-2020-09-25' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
Kalle Valo says:
====================
wireless-drivers fixes for v5.9
Second, and last, set of fixes for v5.9. Only one important regression
fix for mt76.
mt76
* fix a regression in aggregation which appeared after mac80211 changes
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7615/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/init.c b/drivers/net/wireless/mediatek/mt76/mt7615/init.c index fc1ebabfebac..1f57b43693bc 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/init.c @@ -460,7 +460,7 @@ void mt7615_init_device(struct mt7615_dev *dev) dev->mphy.sband_2g.sband.ht_cap.cap |= IEEE80211_HT_CAP_LDPC_CODING; dev->mphy.sband_5g.sband.ht_cap.cap |= IEEE80211_HT_CAP_LDPC_CODING; dev->mphy.sband_5g.sband.vht_cap.cap |= - IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 | + IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 | IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK; mt7615_cap_dbdc_disable(dev); dev->phy.dfs_state = -1; |