Skip to content

Commit 0d48a84

Browse files
kuba-mookuba-moo
committed
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: Jakub Kicinski <kuba@kernel.org>
2 parents 3c50c8b + 16e455a commit 0d48a84

File tree

8 files changed

+25
-35
lines changed

8 files changed

+25
-35
lines changed

‎MAINTAINERS

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3262,9 +3262,8 @@ F: Documentation/devicetree/bindings/input/atmel,maxtouch.yaml
32623262
F: drivers/input/touchscreen/atmel_mxt_ts.c
32633263

32643264
ATMEL WIRELESS DRIVER
3265-
M: Simon Kelley <simon@thekelleys.org.uk>
32663265
L: linux-wireless@vger.kernel.org
3267-
S: Maintained
3266+
S: Orphan
32683267
W: http://www.thekelleys.org.uk/atmel
32693268
W: http://atmelwlandriver.sourceforge.net/
32703269
F: drivers/net/wireless/atmel/atmel*
@@ -3394,7 +3393,7 @@ F: drivers/media/radio/radio-aztech*
33943393
B43 WIRELESS DRIVER
33953394
L: linux-wireless@vger.kernel.org
33963395
L: b43-dev@lists.infradead.org
3397-
S: Odd Fixes
3396+
S: Orphan
33983397
W: https://wireless.wiki.kernel.org/en/users/Drivers/b43
33993398
F: drivers/net/wireless/broadcom/b43/
34003399

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

54635462
CW1200 WLAN driver
5464-
M: Solomon Peachy <pizza@shaftnet.org>
5465-
S: Maintained
5463+
S: Orphan
54665464
F: drivers/net/wireless/st/cw1200/
54675465

54685466
CX18 VIDEO4LINUX DRIVER
@@ -12591,18 +12589,14 @@ F: Documentation/devicetree/bindings/net/marvell,pp2.yaml
1259112589
F: drivers/net/ethernet/marvell/mvpp2/
1259212590

1259312591
MARVELL MWIFIEX WIRELESS DRIVER
12594-
M: Amitkumar Karwar <amitkarwar@gmail.com>
12595-
M: Ganapathi Bhat <ganapathi017@gmail.com>
12596-
M: Sharvari Harisangam <sharvari.harisangam@nxp.com>
12597-
M: Xinming Hu <huxinming820@gmail.com>
12592+
M: Brian Norris <briannorris@chromium.org>
1259812593
L: linux-wireless@vger.kernel.org
12599-
S: Maintained
12594+
S: Odd Fixes
1260012595
F: drivers/net/wireless/marvell/mwifiex/
1260112596

1260212597
MARVELL MWL8K WIRELESS DRIVER
12603-
M: Lennert Buytenhek <buytenh@wantstofly.org>
1260412598
L: linux-wireless@vger.kernel.org
12605-
S: Odd Fixes
12599+
S: Orphan
1260612600
F: drivers/net/wireless/marvell/mwl8k.c
1260712601

1260812602
MARVELL NAND CONTROLLER DRIVER
@@ -17448,13 +17442,15 @@ F: drivers/media/tuners/qt1010*
1744817442

1744917443
QUALCOMM ATH12K WIRELESS DRIVER
1745017444
M: Kalle Valo <kvalo@kernel.org>
17445+
M: Jeff Johnson <quic_jjohnson@quicinc.com>
1745117446
L: ath12k@lists.infradead.org
1745217447
S: Supported
1745317448
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
1745417449
F: drivers/net/wireless/ath/ath12k/
1745517450

1745617451
QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
1745717452
M: Kalle Valo <kvalo@kernel.org>
17453+
M: Jeff Johnson <quic_jjohnson@quicinc.com>
1745817454
L: ath10k@lists.infradead.org
1745917455
S: Supported
1746017456
W: https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
@@ -17464,6 +17460,7 @@ F: drivers/net/wireless/ath/ath10k/
1746417460

1746517461
QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
1746617462
M: Kalle Valo <kvalo@kernel.org>
17463+
M: Jeff Johnson <quic_jjohnson@quicinc.com>
1746717464
L: ath11k@lists.infradead.org
1746817465
S: Supported
1746917466
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
1798417981
F: drivers/net/wireless/realtek/rtlwifi/
1798517982

1798617983
REALTEK WIRELESS DRIVER (rtw88)
17987-
M: Yan-Hsuan Chuang <tony0620emma@gmail.com>
17984+
M: Ping-Ke Shih <pkshih@realtek.com>
1798817985
L: linux-wireless@vger.kernel.org
1798917986
S: Maintained
1799017987
F: drivers/net/wireless/realtek/rtw88/
@@ -21900,9 +21897,8 @@ S: Maintained
2190021897
F: drivers/usb/misc/apple-mfi-fastcharge.c
2190121898

2190221899
USB AR5523 WIRELESS DRIVER
21903-
M: Pontus Fuchs <pontus.fuchs@gmail.com>
2190421900
L: linux-wireless@vger.kernel.org
21905-
S: Maintained
21901+
S: Orphan
2190621902
F: drivers/net/wireless/ath/ar5523/
2190721903

2190821904
USB ATTACHED SCSI
@@ -22179,9 +22175,8 @@ F: drivers/usb/gadget/legacy/webcam.c
2217922175
F: include/uapi/linux/usb/g_uvc.h
2218022176

2218122177
USB WIRELESS RNDIS DRIVER (rndis_wlan)
22182-
M: Jussi Kivilinna <jussi.kivilinna@iki.fi>
2218322178
L: linux-wireless@vger.kernel.org
22184-
S: Maintained
22179+
S: Orphan
2218522180
F: drivers/net/wireless/legacy/rndis_wlan.c
2218622181

2218722182
USB XHCI DRIVER
@@ -22956,7 +22951,7 @@ F: drivers/input/misc/wistron_btns.c
2295622951

2295722952
WL3501 WIRELESS PCMCIA CARD DRIVER
2295822953
L: linux-wireless@vger.kernel.org
22959-
S: Odd fixes
22954+
S: Orphan
2296022955
F: drivers/net/wireless/legacy/wl3501*
2296122956

2296222957
WMI BINARY MOF DRIVER
@@ -23527,11 +23522,8 @@ S: Maintained
2352723522
F: mm/zbud.c
2352823523

2352923524
ZD1211RW WIRELESS DRIVER
23530-
M: Ulrich Kunitz <kune@deine-taler.de>
2353123525
L: linux-wireless@vger.kernel.org
23532-
L: zd1211-devs@lists.sourceforge.net (subscribers-only)
23533-
S: Maintained
23534-
W: http://zd1211.ath.cx/wiki/DriverRewrite
23526+
S: Orphan
2353523527
F: drivers/net/wireless/zydas/zd1211rw/
2353623528

2353723529
ZD1301 MEDIA DRIVER

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,6 @@ static void ath11k_ahb_ext_irq_enable(struct ath11k_base *ab)
376376
struct ath11k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i];
377377

378378
if (!irq_grp->napi_enabled) {
379-
dev_set_threaded(&irq_grp->napi_ndev, true);
380379
napi_enable(&irq_grp->napi);
381380
irq_grp->napi_enabled = true;
382381
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,6 @@ void ath11k_pcic_ext_irq_enable(struct ath11k_base *ab)
466466
struct ath11k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i];
467467

468468
if (!irq_grp->napi_enabled) {
469-
dev_set_threaded(&irq_grp->napi_ndev, true);
470469
napi_enable(&irq_grp->napi);
471470
irq_grp->napi_enabled = true;
472471
}

‎drivers/net/wireless/ath/ath6kl/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ ath6kl_core-y += wmi.o
3636
ath6kl_core-y += core.o
3737
ath6kl_core-y += recovery.o
3838

39-
# FIXME: temporarily silence -Wdangling-pointer on non W=1+ builds
40-
ifndef KBUILD_EXTRA_WARN
41-
CFLAGS_htc_mbox.o += $(call cc-disable-warning, dangling-pointer)
42-
endif
43-
4439
ath6kl_core-$(CONFIG_NL80211_TESTMODE) += testmode.o
4540
ath6kl_core-$(CONFIG_ATH6KL_TRACING) += trace.o
4641

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,12 @@ struct brcmf_scan_params_le {
398398
* fixed parameter portion is assumed, otherwise
399399
* ssid in the fixed portion is ignored
400400
*/
401-
__le16 channel_list[1]; /* list of chanspecs */
401+
union {
402+
__le16 padding; /* Reserve space for at least 1 entry for abort
403+
* which uses an on stack brcmf_scan_params_le
404+
*/
405+
DECLARE_FLEX_ARRAY(__le16, channel_list); /* chanspecs */
406+
};
402407
};
403408

404409
struct brcmf_scan_params_v2_le {

‎drivers/net/wireless/legacy/rayctl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ struct tx_msg {
577577
struct tib_structure tib;
578578
struct phy_header phy;
579579
struct mac_header mac;
580-
UCHAR var[1];
580+
UCHAR var[];
581581
};
582582

583583
/****** ECF Receive Control Structure (RCS) Area at Shared RAM offset 0x0800 */

‎drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,12 @@ mt7615_eeprom_parse_hw_band_cap(struct mt7615_dev *dev)
128128
case MT_EE_5GHZ:
129129
dev->mphy.cap.has_5ghz = true;
130130
break;
131-
case MT_EE_2GHZ:
132-
dev->mphy.cap.has_2ghz = true;
133-
break;
134131
case MT_EE_DBDC:
135132
dev->dbdc_support = true;
136133
fallthrough;
134+
case MT_EE_2GHZ:
135+
dev->mphy.cap.has_2ghz = true;
136+
break;
137137
default:
138138
dev->mphy.cap.has_2ghz = true;
139139
dev->mphy.cap.has_5ghz = true;

‎net/wireless/scan.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ static int cfg80211_parse_colocated_ap(const struct cfg80211_bss_ies *ies,
657657

658658
ret = cfg80211_calc_short_ssid(ies, &ssid_elem, &s_ssid_tmp);
659659
if (ret)
660-
return ret;
660+
return 0;
661661

662662
for_each_element_id(elem, WLAN_EID_REDUCED_NEIGHBOR_REPORT,
663663
ies->data, ies->len) {

0 commit comments

Comments
 (0)