Commit 094cc3b6 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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: default avatarJakub Kicinski <kuba@kernel.org>
parents 0ee513c7 781b80f4

drivers/net/wireless/intel/iwlwifi/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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.

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+2 −2
Original line number Diff line number Diff line
@@ -1833,7 +1833,7 @@ 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,

		IWL_DEBUG_INFO(mvm, "Got NSS = %d - trimming to %d\n", nss,

			       MAX_HE_SUPP_NSS);

		nss = MAX_HE_SUPP_NSS;

	}

drivers/net/wireless/mediatek/mt76/mac80211.c

+2 −1
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ 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);

	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);

}

drivers/net/wireless/mediatek/mt76/mt7615/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -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;