github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-23 14:42:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

wireless fixes for v6.0

Browse Source 
Late stage fixes for v6.0. Temporarily mark iwlwifi's mei code broken
 as it breaks suspend for iwd users and also don't spam nss trimming
 messages. mt76 has fixes for aggregation sequence numbers and a
 regression related to the VHT extended NSS BW feature.
 -----BEGIN PGP SIGNATURE-----
 
 iQFFBAABCgAvFiEEiBjanGPFTz4PRfLobhckVSbrbZsFAmMoSPcRHGt2YWxvQGtl
 cm5lbC5vcmcACgkQbhckVSbrbZu/dAf/d8ItryiSE6wVrZSrhuDbcuCHbofUfF7D
 DuFP5y96DtbOv8tWmOpFG8xIKQSYFk+5rN5Q2CdxCP3UszMMRcAkrrmNIeoB+Oll
 XeW0GpODZFqs4sO11t/zLMXNdp8FWQV+RkL1LVE2k5S3HNv0SIcg3GOIHzzlNjHg
 Z9RFVFS7+RkGi1MQq2SJneYS/KCKxguNq4njWxkISz7tioEOyAEojxbTp2gitMzz
 WE5sN/58miW0hAuch23B4qHAydTudOgwTBGczJe12mozCUHZf2A4CEZ4MJIx/H/l
 WwBabwTkPU3b9+yHvrA9BqTdeEKXiaCxTlvKF1/42yIU5ihKwT499Q==
 =g3jP
 -----END PGP SIGNATURE-----

Merge tag 'wireless-2022-09-19' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless

Kalle Valo says:

====================
wireless fixes for v6.0

Late stage fixes for v6.0. Temporarily mark iwlwifi's mei code broken
as it breaks suspend for iwd users and also don't spam nss trimming
messages. mt76 has fixes for aggregation sequence numbers and a
regression related to the VHT extended NSS BW feature.

* tag 'wireless-2022-09-19' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  wifi: mt76: fix 5 GHz connection regression on mt76x0/mt76x2
  wifi: mt76: fix reading current per-tid starting sequence number for aggregation
  wifi: iwlwifi: Mark IWLMEI as broken
  wifi: iwlwifi: don't spam logs with NSS>2 messages
====================

Link: https://lore.kernel.org/r/20220919105003.1EAE7C433B5@smtp.kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2022-09-19 18:17:22 -07:00
commit 094cc3b649
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/intel/iwlwifi/Kconfig
View File

@ -140,6 +140,7 @@ config IWLMEI
depends on INTEL_MEI
depends on PM
depends on CFG80211
depends on BROKEN
help
Enables the iwlmei kernel module.

4
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
View File

@ -1833,8 +1833,8 @@ static void iwl_mvm_parse_ppe(struct iwl_mvm *mvm,
* If nss < MAX: we can set zeros in other streams
*/
if (nss > MAX_HE_SUPP_NSS) {
IWL_INFO(mvm, "Got NSS = %d - trimming to %d\n", nss,
MAX_HE_SUPP_NSS);
IWL_DEBUG_INFO(mvm, "Got NSS = %d - trimming to %d\n", nss,
MAX_HE_SUPP_NSS);
nss = MAX_HE_SUPP_NSS;
}

3
drivers/net/wireless/mediatek/mt76/mac80211.c
View File

@ -267,7 +267,8 @@ static void mt76_init_stream_cap(struct mt76_phy *phy,
}
vht_cap->vht_mcs.rx_mcs_map = cpu_to_le16(mcs_map);
vht_cap->vht_mcs.tx_mcs_map = cpu_to_le16(mcs_map);
vht_cap->vht_mcs.tx_highest |=
if (ieee80211_hw_check(phy->hw, SUPPORTS_VHT_EXT_NSS_BW))
vht_cap->vht_mcs.tx_highest |=
cpu_to_le16(IEEE80211_VHT_EXT_NSS_BW_CAPABLE);
}

2
drivers/net/wireless/mediatek/mt76/mt7615/mac.c
View File

@ -1088,7 +1088,7 @@ u32 mt7615_mac_get_sta_tid_sn(struct mt7615_dev *dev, int wcid, u8 tid)
offset %= 32;
val = mt76_rr(dev, addr);
val >>= (tid % 32);
val >>= offset;
if (offset > 20) {
addr += 4;