Commit 0d1bf7a5 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-drivers-2021-02-26' of... 

Merge tag 'wireless-drivers-2021-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers

Kalle Valo says:

====================
wireless-drivers fixes for v5.12

First set of fixes for v5.12. One iwlwifi kernel crash fix and smaller
fixes to multiple drivers.

ath9k
 * fix Spatial Multiplexing Power Save (SMPS) handling to improve thoughtput

mt76
 * error handling fixes
 * memory leax fixes

iwlwifi
 * don't crash during debug collection on DVM devices

MAINTAINERS
 * email address update

ath11k
 * fix GCC warning about DMA address debug messages
 * fix regression which broke QCA6390 AP mode

* tag 'wireless-drivers-2021-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers:
  mt76: mt7915: fix unused 'mode' variable
  mt76: dma: do not report truncated frames to mac80211
  mt76: mt7921: remove incorrect error handling
  iwlwifi: pcie: fix iwl_so_trans_cfg link error when CONFIG_IWLMVM is disabled
  ath11k: fix AP mode for QCA6390
  ath11k: qmi: use %pad to format dma_addr_t
  MAINTAINERS: update for mwifiex driver maintainers
  iwlwifi: avoid crash on unsupported debug collection
  mt76: mt7915: only modify tx buffer list after allocating tx token id
  mt76: fix tx skb error handling in mt76_dma_tx_queue_skb
  ath9k: fix transmitting to stations in dynamic SMPS mode
====================

Link: https://lore.kernel.org/r/20210226164411.CDD03C433CA@smtp.codeaurora.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9e8e714f c490492f

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -10679,7 +10679,8 @@ F: drivers/net/ethernet/marvell/mvpp2/ 








MARVELL MWIFIEX WIRELESS DRIVER









M:	Amitkumar Karwar <amitkarwar@gmail.com>









M:	Ganapathi Bhat <ganapathi.bhat@nxp.com>









M:	Ganapathi Bhat <ganapathi017@gmail.com>









M:	Sharvari Harisangam <sharvari.harisangam@nxp.com>









M:	Xinming Hu <huxinming820@gmail.com>









L:	linux-wireless@vger.kernel.org









S:	Maintained
































drivers/net/wireless/ath/ath11k/mac.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -5450,8 +5450,8 @@ ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,







	}



















	if (ab->hw_params.vdev_start_delay &&









	    (arvif->vdev_type == WMI_VDEV_TYPE_AP ||









	    arvif->vdev_type == WMI_VDEV_TYPE_MONITOR)) {









	    arvif->vdev_type != WMI_VDEV_TYPE_AP &&









	    arvif->vdev_type != WMI_VDEV_TYPE_MONITOR) {









		param.vdev_id = arvif->vdev_id;









		param.peer_type = WMI_PEER_TYPE_DEFAULT;









		param.peer_addr = ar->mac_addr;
































drivers/net/wireless/ath/ath11k/qmi.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -1687,8 +1687,8 @@ static int ath11k_qmi_respond_fw_mem_request(struct ath11k_base *ab)







			req->mem_seg[i].size = ab->qmi.target_mem[i].size;









			req->mem_seg[i].type = ab->qmi.target_mem[i].type;









			ath11k_dbg(ab, ATH11K_DBG_QMI,









				   "qmi req mem_seg[%d] 0x%llx %u %u\n", i,









				    ab->qmi.target_mem[i].paddr,









				   "qmi req mem_seg[%d] %pad %u %u\n", i,









				    &ab->qmi.target_mem[i].paddr,









				    ab->qmi.target_mem[i].size,









				    ab->qmi.target_mem[i].type);









		}
































drivers/net/wireless/ath/ath9k/ath9k.h



+2
−1






























Original line number
Diff line number
Diff line







@@ -177,7 +177,8 @@ struct ath_frame_info {







	s8 txq;









	u8 keyix;









	u8 rtscts_rate;









	u8 retries : 7;









	u8 retries : 6;









	u8 dyn_smps : 1;









	u8 baw_tracked : 1;









	u8 tx_power;









	enum ath9k_key_type keytype:2;
































drivers/net/wireless/ath/ath9k/xmit.c



+6
−0






























Original line number
Diff line number
Diff line







@@ -1271,6 +1271,11 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf,







				 is_40, is_sgi, is_sp);









			if (rix < 8 && (tx_info->flags & IEEE80211_TX_CTL_STBC))









				info->rates[i].RateFlags |= ATH9K_RATESERIES_STBC;









			if (rix >= 8 && fi->dyn_smps) {









				info->rates[i].RateFlags |=









					ATH9K_RATESERIES_RTS_CTS;









				info->flags |= ATH9K_TXDESC_CTSENA;









			}



















			info->txpower[i] = ath_get_rate_txpower(sc, bf, rix,









								is_40, false);








@@ -2114,6 +2119,7 @@ static void setup_frame_info(struct ieee80211_hw *hw,







		fi->keyix = an->ps_key;









	else









		fi->keyix = ATH9K_TXKEYIX_INVALID;









	fi->dyn_smps = sta && sta->smps_mode == IEEE80211_SMPS_DYNAMIC;









	fi->keytype = keytype;









	fi->framelen = framelen;









	fi->tx_power = txpower;