Commit 0303b3a1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-2020-04-24' of...

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



Kalle Valo says:

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

Second set of fixes for v5.7. Quite a few iwlwifi fixes and some
maintainers file updates.

iwlwifi

* fix a bug with kmemdup() error handling

* fix a DMA pool warning about unfreed memory

* fix beacon statistics

* fix a theoritical bug in device initialisation

* fix queue limit handling and inactive TID removal

* disable ACK Enabled Aggregation which was enabled by accident

* fix transmit power setting reading from BIOS with certain versions
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a6d0b83f 10e41f34
Loading
Loading
Loading
Loading
+21 −23
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ F: drivers/net/hamradio/6pack.c
M:	Johannes Berg <johannes@sipsolutions.net>
L:	linux-wireless@vger.kernel.org
S:	Maintained
W:	http://wireless.kernel.org/
W:	https://wireless.wiki.kernel.org/
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
F:	Documentation/driver-api/80211/cfg80211.rst
@@ -505,7 +505,7 @@ F: drivers/hwmon/adm1029.c
ADM8211 WIRELESS DRIVER
L:	linux-wireless@vger.kernel.org
S:	Orphan
W:	http://wireless.kernel.org/
W:	https://wireless.wiki.kernel.org/
F:	drivers/net/wireless/admtek/adm8211.*
ADP1653 FLASH CONTROLLER DRIVER
@@ -2847,14 +2847,14 @@ M: Nick Kossifidis <mickflemm@gmail.com>
M:	Luis Chamberlain <mcgrof@kernel.org>
L:	linux-wireless@vger.kernel.org
S:	Maintained
W:	http://wireless.kernel.org/en/users/Drivers/ath5k
W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath5k
F:	drivers/net/wireless/ath/ath5k/
ATHEROS ATH6KL WIRELESS DRIVER
M:	Kalle Valo <kvalo@codeaurora.org>
L:	linux-wireless@vger.kernel.org
S:	Supported
W:	http://wireless.kernel.org/en/users/Drivers/ath6kl
W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath6kl
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
F:	drivers/net/wireless/ath/ath6kl/
@@ -3017,7 +3017,7 @@ B43 WIRELESS DRIVER
L:	linux-wireless@vger.kernel.org
L:	b43-dev@lists.infradead.org
S:	Odd Fixes
W:	http://wireless.kernel.org/en/users/Drivers/b43
W:	https://wireless.wiki.kernel.org/en/users/Drivers/b43
F:	drivers/net/wireless/broadcom/b43/
B43LEGACY WIRELESS DRIVER
@@ -3025,7 +3025,7 @@ M: Larry Finger <Larry.Finger@lwfinger.net>
L:	linux-wireless@vger.kernel.org
L:	b43-dev@lists.infradead.org
S:	Maintained
W:	http://wireless.kernel.org/en/users/Drivers/b43
W:	https://wireless.wiki.kernel.org/en/users/Drivers/b43
F:	drivers/net/wireless/broadcom/b43legacy/
BACKLIGHT CLASS/SUBSYSTEM
@@ -3840,7 +3840,7 @@ CARL9170 LINUX COMMUNITY WIRELESS DRIVER
M:	Christian Lamparter <chunkeey@googlemail.com>
L:	linux-wireless@vger.kernel.org
S:	Maintained
W:	http://wireless.kernel.org/en/users/Drivers/carl9170
W:	https://wireless.wiki.kernel.org/en/users/Drivers/carl9170
F:	drivers/net/wireless/ath/carl9170/
CAVIUM I2C DRIVER
@@ -10065,7 +10065,7 @@ MAC80211
M:	Johannes Berg <johannes@sipsolutions.net>
L:	linux-wireless@vger.kernel.org
S:	Maintained
W:	http://wireless.kernel.org/
W:	https://wireless.wiki.kernel.org/
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
F:	Documentation/networking/mac80211-injection.txt
@@ -10695,7 +10695,6 @@ MEDIATEK MT76 WIRELESS LAN DRIVER
M:	Felix Fietkau <nbd@nbd.name>
M:	Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
R:	Ryder Lee <ryder.lee@mediatek.com>
R:	Roy Luo <royluo@google.com>
L:	linux-wireless@vger.kernel.org
S:	Maintained
F:	drivers/net/wireless/mediatek/mt76/
@@ -12646,7 +12645,7 @@ F: fs/orangefs/
ORINOCO DRIVER
L:	linux-wireless@vger.kernel.org
S:	Orphan
W:	http://wireless.kernel.org/en/users/Drivers/orinoco
W:	https://wireless.wiki.kernel.org/en/users/Drivers/orinoco
W:	http://www.nongnu.org/orinoco/
F:	drivers/net/wireless/intersil/orinoco/
@@ -12672,7 +12671,7 @@ P54 WIRELESS DRIVER
M:	Christian Lamparter <chunkeey@googlemail.com>
L:	linux-wireless@vger.kernel.org
S:	Maintained
W:	http://wireless.kernel.org/en/users/Drivers/p54
W:	https://wireless.wiki.kernel.org/en/users/Drivers/p54
F:	drivers/net/wireless/intersil/p54/
PACKING
@@ -13593,7 +13592,7 @@ PRISM54 WIRELESS DRIVER
M:	Luis Chamberlain <mcgrof@kernel.org>
L:	linux-wireless@vger.kernel.org
S:	Obsolete
W:	http://wireless.kernel.org/en/users/Drivers/p54
W:	https://wireless.wiki.kernel.org/en/users/Drivers/p54
F:	drivers/net/wireless/intersil/prism54/
PROC FILESYSTEM
@@ -13933,7 +13932,7 @@ QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
M:	Kalle Valo <kvalo@codeaurora.org>
L:	ath10k@lists.infradead.org
S:	Supported
W:	http://wireless.kernel.org/en/users/Drivers/ath10k
W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
F:	drivers/net/wireless/ath/ath10k/
@@ -13948,7 +13947,7 @@ QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
M:	QCA ath9k Development <ath9k-devel@qca.qualcomm.com>
L:	linux-wireless@vger.kernel.org
S:	Supported
W:	http://wireless.kernel.org/en/users/Drivers/ath9k
W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath9k
F:	drivers/net/wireless/ath/ath9k/
QUALCOMM CAMERA SUBSYSTEM DRIVER
@@ -14045,13 +14044,12 @@ QUALCOMM WCN36XX WIRELESS DRIVER
M:	Kalle Valo <kvalo@codeaurora.org>
L:	wcn36xx@lists.infradead.org
S:	Supported
W:	http://wireless.kernel.org/en/users/Drivers/wcn36xx
W:	https://wireless.wiki.kernel.org/en/users/Drivers/wcn36xx
T:	git git://github.com/KrasnikovEugene/wcn36xx.git
F:	drivers/net/wireless/ath/wcn36xx/
QUANTENNA QTNFMAC WIRELESS DRIVER
M:	Igor Mitsyanko <imitsyanko@quantenna.com>
M:	Avinash Patil <avinashp@quantenna.com>
M:	Sergey Matyukevich <smatyukevich@quantenna.com>
L:	linux-wireless@vger.kernel.org
S:	Maintained
@@ -14273,7 +14271,7 @@ REALTEK WIRELESS DRIVER (rtlwifi family)
M:	Ping-Ke Shih <pkshih@realtek.com>
L:	linux-wireless@vger.kernel.org
S:	Maintained
W:	http://wireless.kernel.org/
W:	https://wireless.wiki.kernel.org/
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
F:	drivers/net/wireless/realtek/rtlwifi/
@@ -14408,7 +14406,7 @@ RFKILL
M:	Johannes Berg <johannes@sipsolutions.net>
L:	linux-wireless@vger.kernel.org
S:	Maintained
W:	http://wireless.kernel.org/
W:	https://wireless.wiki.kernel.org/
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
F:	Documentation/ABI/stable/sysfs-class-rfkill
@@ -14557,7 +14555,7 @@ F: drivers/media/dvb-frontends/rtl2832_sdr*
RTL8180 WIRELESS DRIVER
L:	linux-wireless@vger.kernel.org
S:	Orphan
W:	http://wireless.kernel.org/
W:	https://wireless.wiki.kernel.org/
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
F:	drivers/net/wireless/realtek/rtl818x/rtl8180/
@@ -14567,7 +14565,7 @@ M: Hin-Tak Leung <htl10@users.sourceforge.net>
M:	Larry Finger <Larry.Finger@lwfinger.net>
L:	linux-wireless@vger.kernel.org
S:	Maintained
W:	http://wireless.kernel.org/
W:	https://wireless.wiki.kernel.org/
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
F:	drivers/net/wireless/realtek/rtl818x/rtl8187/
@@ -16922,8 +16920,8 @@ F: drivers/media/platform/ti-vpe/
TI WILINK WIRELESS DRIVERS
L:	linux-wireless@vger.kernel.org
S:	Orphan
W:	http://wireless.kernel.org/en/users/Drivers/wl12xx
W:	http://wireless.kernel.org/en/users/Drivers/wl1251
W:	https://wireless.wiki.kernel.org/en/users/Drivers/wl12xx
W:	https://wireless.wiki.kernel.org/en/users/Drivers/wl1251
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
F:	drivers/net/wireless/ti/
F:	include/linux/wl12xx.h
@@ -18205,7 +18203,7 @@ M: Maya Erez <merez@codeaurora.org>
L:	linux-wireless@vger.kernel.org
L:	wil6210@qti.qualcomm.com
S:	Supported
W:	http://wireless.kernel.org/en/users/Drivers/wil6210
W:	https://wireless.wiki.kernel.org/en/users/Drivers/wil6210
F:	drivers/net/wireless/ath/wil6210/
WIMAX STACK
+7 −2
Original line number Diff line number Diff line
@@ -296,9 +296,14 @@ int iwl_sar_select_profile(struct iwl_fw_runtime *fwrt,
		if (!prof->enabled) {
			IWL_DEBUG_RADIO(fwrt, "SAR profile %d is disabled.\n",
					profs[i]);
			/* if one of the profiles is disabled, we fail all */
			return -ENOENT;
			/*
			 * if one of the profiles is disabled, we
			 * ignore all of them and return 1 to
			 * differentiate disabled from other failures.
			 */
			return 1;
		}

		IWL_DEBUG_INFO(fwrt,
			       "SAR EWRD: chain %d profile index %d\n",
			       i, profs[i]);
+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@
 * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
 * Copyright(c) 2019 Intel Corporation
 * Copyright(c) 2019 - 2020 Intel Corporation
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of version 2 of the GNU General Public License as
@@ -31,7 +31,7 @@
 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
 * Copyright(c) 2019 Intel Corporation
 * Copyright(c) 2019 - 2020 Intel Corporation
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -99,7 +99,7 @@ enum iwl_mvm_dqa_txq {
	IWL_MVM_DQA_MAX_MGMT_QUEUE = 8,
	IWL_MVM_DQA_AP_PROBE_RESP_QUEUE = 9,
	IWL_MVM_DQA_MIN_DATA_QUEUE = 10,
	IWL_MVM_DQA_MAX_DATA_QUEUE = 31,
	IWL_MVM_DQA_MAX_DATA_QUEUE = 30,
};

enum iwl_mvm_tx_fifo {
+1 −1
Original line number Diff line number Diff line
@@ -1467,7 +1467,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
				kmemdup(pieces->dbg_conf_tlv[i],
					pieces->dbg_conf_tlv_len[i],
					GFP_KERNEL);
			if (!pieces->dbg_conf_tlv[i])
			if (!drv->fw.dbg.conf_tlv[i])
				goto out_free_fw;
		}
	}
+2 −4
Original line number Diff line number Diff line
@@ -532,8 +532,7 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = {
					IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US |
					IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_8,
				.mac_cap_info[2] =
					IEEE80211_HE_MAC_CAP2_32BIT_BA_BITMAP |
					IEEE80211_HE_MAC_CAP2_ACK_EN,
					IEEE80211_HE_MAC_CAP2_32BIT_BA_BITMAP,
				.mac_cap_info[3] =
					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
@@ -617,8 +616,7 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = {
					IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US |
					IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_8,
				.mac_cap_info[2] =
					IEEE80211_HE_MAC_CAP2_BSR |
					IEEE80211_HE_MAC_CAP2_ACK_EN,
					IEEE80211_HE_MAC_CAP2_BSR,
				.mac_cap_info[3] =
					IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
Loading