Commit 1d1c950f authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-2021-12-15' of... 

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



Kalle Valo says:

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

Second set of fixes for v5.16, hopefully also the last one. I changed
my email in MAINTAINERS, one crash fix in iwlwifi and some build
problems fixed.

iwlwifi

* fix crash caused by a warning

* fix LED linking problem

brcmsmac

* rework LED dependencies for being consistent with other drivers

mt76

* mt7921: fix build regression
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7c8089f9 f7d55d2e

MAINTAINERS

+6 −6
Original line number Diff line number Diff line
@@ -3066,7 +3066,7 @@ F: Documentation/devicetree/bindings/phy/phy-ath79-usb.txt 
F:	drivers/phy/qualcomm/phy-ath79-usb.c









ATHEROS ATH GENERIC UTILITIES









M:	Kalle Valo <kvalo@codeaurora.org>









M:	Kalle Valo <kvalo@kernel.org>









L:	linux-wireless@vger.kernel.org









S:	Supported









F:	drivers/net/wireless/ath/*








@@ -3081,7 +3081,7 @@ 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>









M:	Kalle Valo <kvalo@kernel.org>









L:	linux-wireless@vger.kernel.org









S:	Supported









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








@@ -13249,7 +13249,7 @@ F:	include/uapi/linux/if_*







F:	include/uapi/linux/netdevice.h

















NETWORKING DRIVERS (WIRELESS)









M:	Kalle Valo <kvalo@codeaurora.org>









M:	Kalle Valo <kvalo@kernel.org>









L:	linux-wireless@vger.kernel.org









S:	Maintained









Q:	http://patchwork.kernel.org/project/linux-wireless/list/








@@ -15705,7 +15705,7 @@ T:	git git://linuxtv.org/anttip/media_tree.git







F:	drivers/media/tuners/qt1010*

















QUALCOMM ATHEROS ATH10K WIRELESS DRIVER









M:	Kalle Valo <kvalo@codeaurora.org>









M:	Kalle Valo <kvalo@kernel.org>









L:	ath10k@lists.infradead.org









S:	Supported









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








@@ -15713,7 +15713,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git







F:	drivers/net/wireless/ath/ath10k/

















QUALCOMM ATHEROS ATH11K WIRELESS DRIVER









M:	Kalle Valo <kvalo@codeaurora.org>









M:	Kalle Valo <kvalo@kernel.org>









L:	ath11k@lists.infradead.org









S:	Supported









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








@@ -15877,7 +15877,7 @@ F:	Documentation/devicetree/bindings/media/*venus*







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

















QUALCOMM WCN36XX WIRELESS DRIVER









M:	Kalle Valo <kvalo@codeaurora.org>









M:	Kalle Valo <kvalo@kernel.org>









L:	wcn36xx@lists.infradead.org









S:	Supported









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
































drivers/net/wireless/broadcom/brcm80211/Kconfig



+9
−5






























Original line number
Diff line number
Diff line







@@ -7,16 +7,20 @@ config BRCMSMAC







	depends on MAC80211









	depends on BCMA_POSSIBLE









	select BCMA









	select NEW_LEDS if BCMA_DRIVER_GPIO









	select LEDS_CLASS if BCMA_DRIVER_GPIO









	select BRCMUTIL









	select FW_LOADER









	select CORDIC









	help









	  This module adds support for PCIe wireless adapters based on Broadcom









	  IEEE802.11n SoftMAC chipsets. It also has WLAN led support, which will









	  be available if you select BCMA_DRIVER_GPIO. If you choose to build a









	  module, the driver will be called brcmsmac.ko.









	  IEEE802.11n SoftMAC chipsets. If you choose to build a module, the









	  driver will be called brcmsmac.ko.



















config BRCMSMAC_LEDS









	def_bool BRCMSMAC && BCMA_DRIVER_GPIO && MAC80211_LEDS









	help









	  The brcmsmac LED support depends on the presence of the









	  BCMA_DRIVER_GPIO driver, and it only works if LED support









	  is enabled and reachable from the driver module.



















source "drivers/net/wireless/broadcom/brcm80211/brcmfmac/Kconfig"










































drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -42,6 +42,6 @@ brcmsmac-y := \







	brcms_trace_events.o \









	debug.o



















brcmsmac-$(CONFIG_BCMA_DRIVER_GPIO) += led.o









brcmsmac-$(CONFIG_BRCMSMAC_LEDS) += led.o



















obj-$(CONFIG_BRCMSMAC)	+= brcmsmac.o
























drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -24,7 +24,7 @@ struct brcms_led {







	struct gpio_desc *gpiod;









};



















#ifdef CONFIG_BCMA_DRIVER_GPIO









#ifdef CONFIG_BRCMSMAC_LEDS









void brcms_led_unregister(struct brcms_info *wl);









int brcms_led_register(struct brcms_info *wl);









#else
































drivers/net/wireless/intel/iwlegacy/Kconfig



+2
−2






























Original line number
Diff line number
Diff line







@@ -2,14 +2,13 @@







config IWLEGACY









	tristate









	select FW_LOADER









	select NEW_LEDS









	select LEDS_CLASS









	select LEDS_TRIGGERS









	select MAC80211_LEDS



















config IWL4965









	tristate "Intel Wireless WiFi 4965AGN (iwl4965)"









	depends on PCI && MAC80211









	depends on LEDS_CLASS=y || LEDS_CLASS=MAC80211









	select IWLEGACY









	help









	  This option enables support for








@@ -38,6 +37,7 @@ config IWL4965







config IWL3945









	tristate "Intel PRO/Wireless 3945ABG/BG Network Connection (iwl3945)"









	depends on PCI && MAC80211









	depends on LEDS_CLASS=y || LEDS_CLASS=MAC80211









	select IWLEGACY









	help









	  Select to build the driver supporting the: