Commit 85d24ad3 authored by David S. Miller's avatar David S. Miller
Browse files

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

wireless fixes for v5.17

Second set of fixes for v5.17. This is the first pull request with
both driver and stack patches.

Most important here are a regression fix for brcmfmac USB devices and
an iwlwifi fix for use after free when the firmware was missing. We
have new maintainers for ath9k and wcn36xx as well as ath6kl is now
orphaned. Also smaller fixes to iwlwifi and stack.
parents 525de9a7 bea2662e

MAINTAINERS

+6 −7
Original line number Diff line number Diff line
@@ -3133,11 +3133,9 @@ W: https://wireless.wiki.kernel.org/en/users/Drivers/ath5k 
F:	drivers/net/wireless/ath/ath5k/









ATHEROS ATH6KL WIRELESS DRIVER









M:	Kalle Valo <kvalo@kernel.org>









L:	linux-wireless@vger.kernel.org









S:	Supported









S:	Orphan









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/

















ATI_REMOTE2 DRIVER








@@ -15896,6 +15894,7 @@ S:	Supported







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/









F:	Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt

















QUALCOMM ATHEROS ATH11K WIRELESS DRIVER









M:	Kalle Valo <kvalo@kernel.org>








@@ -15903,11 +15902,12 @@ L:	ath11k@lists.infradead.org







S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git









F:	drivers/net/wireless/ath/ath11k/









F:	Documentation/devicetree/bindings/net/wireless/qcom,ath11k.txt

















QUALCOMM ATHEROS ATH9K WIRELESS DRIVER









M:	ath9k-devel@qca.qualcomm.com









M:	Toke Høiland-Jørgensen <toke@toke.dk>









L:	linux-wireless@vger.kernel.org









S:	Supported









S:	Maintained









W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath9k









F:	Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml









F:	drivers/net/wireless/ath/ath9k/








@@ -16088,11 +16088,10 @@ F:	Documentation/devicetree/bindings/media/*venus*







F:	drivers/media/platform/qcom/venus/

















QUALCOMM WCN36XX WIRELESS DRIVER









M:	Kalle Valo <kvalo@kernel.org>









M:	Loic Poulain <loic.poulain@linaro.org>









L:	wcn36xx@lists.infradead.org









S:	Supported









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
































drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c



+4
−2






























Original line number
Diff line number
Diff line







@@ -693,7 +693,7 @@ int brcmf_fw_get_firmwares(struct device *dev, struct brcmf_fw_request *req,







{









	struct brcmf_fw_item *first = &req->items[0];









	struct brcmf_fw *fwctx;









	char *alt_path;









	char *alt_path = NULL;









	int ret;



















	brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(dev));








@@ -712,7 +712,9 @@ int brcmf_fw_get_firmwares(struct device *dev, struct brcmf_fw_request *req,







	fwctx->done = fw_cb;



















	/* First try alternative board-specific path if any */









	alt_path = brcm_alt_fw_path(first->path, fwctx->req->board_type);









	if (fwctx->req->board_type)









		alt_path = brcm_alt_fw_path(first->path,









					    fwctx->req->board_type);









	if (alt_path) {









		ret = request_firmware_nowait(THIS_MODULE, true, alt_path,









					      fwctx->dev, GFP_KERNEL, fwctx,
































drivers/net/wireless/intel/iwlwifi/Kconfig



+0
−13






























Original line number
Diff line number
Diff line







@@ -80,19 +80,6 @@ config IWLWIFI_OPMODE_MODULAR







comment "WARNING: iwlwifi is useless without IWLDVM or IWLMVM"









	depends on IWLDVM=n && IWLMVM=n



















config IWLWIFI_BCAST_FILTERING









	bool "Enable broadcast filtering"









	depends on IWLMVM









	help









	  Say Y here to enable default bcast filtering configuration.



















	  Enabling broadcast filtering will drop any incoming wireless









	  broadcast frames, except some very specific predefined









	  patterns (e.g. incoming arp requests).



















	  If unsure, don't enable this option, as some programs might









	  expect incoming broadcasts for their normal operations.



















menu "Debugging Options"



















config IWLWIFI_DEBUG
































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



+6
−5






























Original line number
Diff line number
Diff line









// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause









/*









 * Copyright (C) 2017 Intel Deutschland GmbH









 * Copyright (C) 2019-2021 Intel Corporation









 * Copyright (C) 2019-2022 Intel Corporation









 */









#include <linux/uuid.h>









#include "iwl-drv.h"








@@ -888,7 +888,8 @@ bool iwl_sar_geo_support(struct iwl_fw_runtime *fwrt)







	 * only one using version 36, so skip this version entirely.









	 */









	return IWL_UCODE_SERIAL(fwrt->fw->ucode_ver) >= 38 ||









	       IWL_UCODE_SERIAL(fwrt->fw->ucode_ver) == 17 ||









		(IWL_UCODE_SERIAL(fwrt->fw->ucode_ver) == 17 &&









		 fwrt->trans->hw_rev != CSR_HW_REV_TYPE_3160) ||









		(IWL_UCODE_SERIAL(fwrt->fw->ucode_ver) == 29 &&









		 ((fwrt->trans->hw_rev & CSR_HW_REV_TYPE_MSK) ==









		  CSR_HW_REV_TYPE_7265D));
































drivers/net/wireless/intel/iwlwifi/fw/api/commands.h



+0
−5






























Original line number
Diff line number
Diff line







@@ -501,11 +501,6 @@ enum iwl_legacy_cmds {







	 */









	DEBUG_LOG_MSG = 0xf7,



















	/**









	 * @BCAST_FILTER_CMD: &struct iwl_bcast_filter_cmd









	 */









	BCAST_FILTER_CMD = 0xcf,



















	/**









	 * @MCAST_FILTER_CMD: &struct iwl_mcast_filter_cmd









	 */