Commit 5169adbc authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-2020-01-23' of... 

Merge tag 'wireless-drivers-2020-01-23' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

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

Second set of fixes for v5.5. There are quite a few patches,
especially on iwlwifi, due to me being on a long break. Libertas also
has a security fix and mt76 a build fix.

iwlwifi

* don't send the PPAG command when PPAG is disabled, since it can cause problems

* a few fixes for a HW bug

* a fix for RS offload;

* a fix for 3168 devices where the NVM tables where the wrong tables were being read

* fix a couple of potential memory leaks in TXQ code

* disable L0S states in all hardware since our hardware doesn't
 officially support them anymore (and older versions of the hardware
 had instability in these states)

* remove lar_disable parameter since it has been causing issues for
  some people who erroneously disable it

* force the debug monitor HW to stop also when debug is disabled,
  since it sometimes stays on and prevents low system power states

* don't send IWL_MVM_RXQ_NSSN_SYNC notification due to DMA problems

libertas

* fix two buffer overflows

mt76

* build fix related to CONFIG_MT76_LEDS

* fix off by one in bitrates handling
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1efba987 d829229e

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -8570,7 +8570,7 @@ S: Maintained 
F:	drivers/platform/x86/intel-vbtn.c















INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)













M:	Stanislaw Gruszka <sgruszka@redhat.com>













M:	Stanislaw Gruszka <stf_xl@wp.pl>















L:	linux-wireless@vger.kernel.org















S:	Supported















F:	drivers/net/wireless/intel/iwlegacy/










@@ -13822,7 +13822,7 @@ S:	Maintained













F:	arch/mips/ralink





























RALINK RT2X00 WIRELESS LAN DRIVER













M:	Stanislaw Gruszka <sgruszka@redhat.com>













M:	Stanislaw Gruszka <stf_xl@wp.pl>















M:	Helmut Schaa <helmut.schaa@googlemail.com>















L:	linux-wireless@vger.kernel.org















S:	Maintained

































drivers/net/wireless/intel/iwlwifi/dvm/tx.c



+1
−2






























Original line number
Diff line number
Diff line








@@ -267,7 +267,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv,













	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);















	struct iwl_station_priv *sta_priv = NULL;















	struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];













	struct iwl_device_cmd *dev_cmd;













	struct iwl_device_tx_cmd *dev_cmd;















	struct iwl_tx_cmd *tx_cmd;















	__le16 fc;















	u8 hdr_len;










@@ -348,7 +348,6 @@ int iwlagn_tx_skb(struct iwl_priv *priv,













	if (unlikely(!dev_cmd))















		goto drop_unlock_priv;





























	memset(dev_cmd, 0, sizeof(*dev_cmd));















	dev_cmd->hdr.cmd = REPLY_TX;















	tx_cmd = (struct iwl_tx_cmd *) dev_cmd->payload;

















































drivers/net/wireless/intel/iwlwifi/fw/acpi.c



+5
−5






























Original line number
Diff line number
Diff line








@@ -357,7 +357,7 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt)













{















	union acpi_object *wifi_pkg, *data;















	bool enabled;













	int i, n_profiles, tbl_rev;













	int i, n_profiles, tbl_rev, pos;















	int ret = 0;































	data = iwl_acpi_get_object(fwrt->dev, ACPI_EWRD_METHOD);










@@ -390,10 +390,10 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt)













		goto out_free;















	}





























	for (i = 0; i < n_profiles; i++) {















	/* the tables start at element 3 */













		int pos = 3;













	pos = 3;





























	for (i = 0; i < n_profiles; i++) {















		/* The EWRD profiles officially go from 2 to 4, but we















		 * save them in sar_profiles[1-3] (because we don't















		 * have profile 0).  So in the array we start from 1.

































drivers/net/wireless/intel/iwlwifi/fw/dbg.c



+1
−6






























Original line number
Diff line number
Diff line








@@ -2669,12 +2669,7 @@ int iwl_fw_dbg_stop_restart_recording(struct iwl_fw_runtime *fwrt,













{















	int ret = 0;





























	/* if the FW crashed or not debug monitor cfg was given, there is













	 * no point in changing the recording state













	 */













	if (test_bit(STATUS_FW_ERROR, &fwrt->trans->status) ||













	    (!fwrt->trans->dbg.dest_tlv &&













	     fwrt->trans->dbg.ini_dest == IWL_FW_INI_LOCATION_INVALID))













	if (test_bit(STATUS_FW_ERROR, &fwrt->trans->status))















		return 0;































	if (fw_has_capa(&fwrt->fw->ucode_capa,

































drivers/net/wireless/intel/iwlwifi/iwl-csr.h



+1
−1






























Original line number
Diff line number
Diff line








@@ -379,7 +379,7 @@ enum {













































/* CSR GIO */













#define CSR_GIO_REG_VAL_L0S_ENABLED	(0x00000002)













#define CSR_GIO_REG_VAL_L0S_DISABLED	(0x00000002)































/*















 * UCODE-DRIVER GP (general purpose) mailbox register 1









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE