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

Merge tag 'wireless-2023-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless 

Kalle Valo says:

====================
wireless fixes for v6.5

We did some house cleaning in MAINTAINERS file so several patches
about that. Few regressions fixed and also fix some recently enabled
memcpy() warnings. Only small commits and nothing special standing
out.

* tag 'wireless-2023-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  wifi: brcmfmac: Fix field-spanning write in brcmf_scan_params_v2_to_v1()
  wifi: ray_cs: Replace 1-element array with flexible array
  MAINTAINERS: add Jeff as ath10k, ath11k and ath12k maintainer
  MAINTAINERS: wifi: mark mlw8k as orphan
  MAINTAINERS: wifi: mark b43 as orphan
  MAINTAINERS: wifi: mark zd1211rw as orphan
  MAINTAINERS: wifi: mark wl3501 as orphan
  MAINTAINERS: wifi: mark rndis_wlan as orphan
  MAINTAINERS: wifi: mark ar5523 as orphan
  MAINTAINERS: wifi: mark cw1200 as orphan
  MAINTAINERS: wifi: atmel: mark as orphan
  MAINTAINERS: wifi: rtw88: change Ping as the maintainer
  Revert "wifi: ath6k: silence false positive -Wno-dangling-pointer warning on GCC 12"
  wifi: cfg80211: Fix return value in scan logic
  Revert "wifi: ath11k: Enable threaded NAPI"
  MAINTAINERS: Update mwifiex maintainer list
  wifi: mt76: mt7615: do not advertise 5 GHz on first phy of MT7615D (DBDC)
====================

Link: https://lore.kernel.org/r/20230803140058.57476C433C9@smtp.kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3c50c8b2 16e455a4

MAINTAINERS

+14 −22
Original line number Diff line number Diff line
@@ -3262,9 +3262,8 @@ F: Documentation/devicetree/bindings/input/atmel,maxtouch.yaml 
F:	drivers/input/touchscreen/atmel_mxt_ts.c









ATMEL WIRELESS DRIVER









M:	Simon Kelley <simon@thekelleys.org.uk>









L:	linux-wireless@vger.kernel.org









S:	Maintained









S:	Orphan









W:	http://www.thekelleys.org.uk/atmel









W:	http://atmelwlandriver.sourceforge.net/









F:	drivers/net/wireless/atmel/atmel*








@@ -3394,7 +3393,7 @@ F:	drivers/media/radio/radio-aztech*







B43 WIRELESS DRIVER









L:	linux-wireless@vger.kernel.org









L:	b43-dev@lists.infradead.org









S:	Odd Fixes









S:	Orphan









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









F:	drivers/net/wireless/broadcom/b43/
















@@ -5461,8 +5460,7 @@ F:	Documentation/devicetree/bindings/net/can/ctu,ctucanfd.yaml







F:	drivers/net/can/ctucanfd/

















CW1200 WLAN driver









M:	Solomon Peachy <pizza@shaftnet.org>









S:	Maintained









S:	Orphan









F:	drivers/net/wireless/st/cw1200/

















CX18 VIDEO4LINUX DRIVER








@@ -12591,18 +12589,14 @@ F:	Documentation/devicetree/bindings/net/marvell,pp2.yaml







F:	drivers/net/ethernet/marvell/mvpp2/

















MARVELL MWIFIEX WIRELESS DRIVER









M:	Amitkumar Karwar <amitkarwar@gmail.com>









M:	Ganapathi Bhat <ganapathi017@gmail.com>









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









M:	Xinming Hu <huxinming820@gmail.com>









M:	Brian Norris <briannorris@chromium.org>









L:	linux-wireless@vger.kernel.org









S:	Maintained









S:	Odd Fixes









F:	drivers/net/wireless/marvell/mwifiex/

















MARVELL MWL8K WIRELESS DRIVER









M:	Lennert Buytenhek <buytenh@wantstofly.org>









L:	linux-wireless@vger.kernel.org









S:	Odd Fixes









S:	Orphan









F:	drivers/net/wireless/marvell/mwl8k.c

















MARVELL NAND CONTROLLER DRIVER








@@ -17448,6 +17442,7 @@ F:	drivers/media/tuners/qt1010*















QUALCOMM ATH12K WIRELESS DRIVER









M:	Kalle Valo <kvalo@kernel.org>









M:	Jeff Johnson <quic_jjohnson@quicinc.com>









L:	ath12k@lists.infradead.org









S:	Supported









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








@@ -17455,6 +17450,7 @@ F:	drivers/net/wireless/ath/ath12k/















QUALCOMM ATHEROS ATH10K WIRELESS DRIVER









M:	Kalle Valo <kvalo@kernel.org>









M:	Jeff Johnson <quic_jjohnson@quicinc.com>









L:	ath10k@lists.infradead.org









S:	Supported









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








@@ -17464,6 +17460,7 @@ F:	drivers/net/wireless/ath/ath10k/















QUALCOMM ATHEROS ATH11K WIRELESS DRIVER









M:	Kalle Valo <kvalo@kernel.org>









M:	Jeff Johnson <quic_jjohnson@quicinc.com>









L:	ath11k@lists.infradead.org









S:	Supported









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








@@ -17984,7 +17981,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.g







F:	drivers/net/wireless/realtek/rtlwifi/

















REALTEK WIRELESS DRIVER (rtw88)









M:	Yan-Hsuan Chuang <tony0620emma@gmail.com>









M:	Ping-Ke Shih <pkshih@realtek.com>









L:	linux-wireless@vger.kernel.org









S:	Maintained









F:	drivers/net/wireless/realtek/rtw88/








@@ -21900,9 +21897,8 @@ S:	Maintained







F:	drivers/usb/misc/apple-mfi-fastcharge.c

















USB AR5523 WIRELESS DRIVER









M:	Pontus Fuchs <pontus.fuchs@gmail.com>









L:	linux-wireless@vger.kernel.org









S:	Maintained









S:	Orphan









F:	drivers/net/wireless/ath/ar5523/

















USB ATTACHED SCSI








@@ -22179,9 +22175,8 @@ F:	drivers/usb/gadget/legacy/webcam.c







F:	include/uapi/linux/usb/g_uvc.h

















USB WIRELESS RNDIS DRIVER (rndis_wlan)









M:	Jussi Kivilinna <jussi.kivilinna@iki.fi>









L:	linux-wireless@vger.kernel.org









S:	Maintained









S:	Orphan









F:	drivers/net/wireless/legacy/rndis_wlan.c

















USB XHCI DRIVER








@@ -22956,7 +22951,7 @@ F:	drivers/input/misc/wistron_btns.c















WL3501 WIRELESS PCMCIA CARD DRIVER









L:	linux-wireless@vger.kernel.org









S:	Odd fixes









S:	Orphan









F:	drivers/net/wireless/legacy/wl3501*

















WMI BINARY MOF DRIVER








@@ -23527,11 +23522,8 @@ S:	Maintained







F:	mm/zbud.c

















ZD1211RW WIRELESS DRIVER









M:	Ulrich Kunitz <kune@deine-taler.de>









L:	linux-wireless@vger.kernel.org









L:	zd1211-devs@lists.sourceforge.net (subscribers-only)









S:	Maintained









W:	http://zd1211.ath.cx/wiki/DriverRewrite









S:	Orphan









F:	drivers/net/wireless/zydas/zd1211rw/

















ZD1301 MEDIA DRIVER

























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



+0
−1






























Original line number
Diff line number
Diff line







@@ -376,7 +376,6 @@ static void ath11k_ahb_ext_irq_enable(struct ath11k_base *ab)







		struct ath11k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i];



















		if (!irq_grp->napi_enabled) {









			dev_set_threaded(&irq_grp->napi_ndev, true);









			napi_enable(&irq_grp->napi);









			irq_grp->napi_enabled = true;









		}
































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



+0
−1






























Original line number
Diff line number
Diff line







@@ -466,7 +466,6 @@ void ath11k_pcic_ext_irq_enable(struct ath11k_base *ab)







		struct ath11k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i];



















		if (!irq_grp->napi_enabled) {









			dev_set_threaded(&irq_grp->napi_ndev, true);









			napi_enable(&irq_grp->napi);









			irq_grp->napi_enabled = true;









		}
































drivers/net/wireless/ath/ath6kl/Makefile



+0
−5






























Original line number
Diff line number
Diff line







@@ -36,11 +36,6 @@ ath6kl_core-y += wmi.o







ath6kl_core-y += core.o









ath6kl_core-y += recovery.o



















# FIXME: temporarily silence -Wdangling-pointer on non W=1+ builds









ifndef KBUILD_EXTRA_WARN









CFLAGS_htc_mbox.o += $(call cc-disable-warning, dangling-pointer)









endif



















ath6kl_core-$(CONFIG_NL80211_TESTMODE) += testmode.o









ath6kl_core-$(CONFIG_ATH6KL_TRACING) += trace.o










































drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h



+6
−1






























Original line number
Diff line number
Diff line







@@ -398,7 +398,12 @@ struct brcmf_scan_params_le {







				 * fixed parameter portion is assumed, otherwise









				 * ssid in the fixed portion is ignored









				 */









	__le16 channel_list[1];	/* list of chanspecs */









	union {









		__le16 padding;	/* Reserve space for at least 1 entry for abort









				 * which uses an on stack brcmf_scan_params_le









				 */









		DECLARE_FLEX_ARRAY(__le16, channel_list);	/* chanspecs */









	};









};



















struct brcmf_scan_params_v2_le {