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

Merge tag 'wireless-next-2022-11-18' of... 

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



Kalle Valo says:

====================
wireless-next patches for v6.2

Second set of patches for v6.2. Only driver patches this time, nothing
really special. Unused platform data support was removed from wl1251
and rtw89 got WoWLAN support.

Major changes:

ath11k

* support configuring channel dwell time during scan

rtw89

* new dynamic header firmware format support

* Wake-over-WLAN support

rtl8xxxu

* enable IEEE80211_HW_SUPPORT_FAST_XMIT
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 22700706 e7e40cc6

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -20660,7 +20660,6 @@ 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









TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER









M:	John Stultz <jstultz@google.com>

























arch/arm/mach-omap2/pdata-quirks.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -10,7 +10,6 @@







#include <linux/init.h>









#include <linux/kernel.h>









#include <linux/of_platform.h>









#include <linux/wl12xx.h>









#include <linux/mmc/card.h>









#include <linux/mmc/host.h>









#include <linux/power/smartreflex.h>
































drivers/bcma/main.c



+3
−1






























Original line number
Diff line number
Diff line







@@ -344,8 +344,10 @@ static int bcma_register_devices(struct bcma_bus *bus)







	err = bcma_gpio_init(&bus->drv_cc);









	if (err == -ENOTSUPP)









		bcma_debug(bus, "GPIO driver not activated\n");









	else if (err)









	else if (err) {









		bcma_err(bus, "Error registering GPIO driver: %i\n", err);









		return err;









	}



















	if (bus->hosttype == BCMA_HOSTTYPE_SOC) {









		err = bcma_chipco_watchdog_register(&bus->drv_cc);
































drivers/net/wireless/ath/ar5523/ar5523.c



+6
−0






























Original line number
Diff line number
Diff line







@@ -241,6 +241,11 @@ static void ar5523_cmd_tx_cb(struct urb *urb)







	}









}



















static void ar5523_cancel_tx_cmd(struct ar5523 *ar)









{









	usb_kill_urb(ar->tx_cmd.urb_tx);









}



















static int ar5523_cmd(struct ar5523 *ar, u32 code, const void *idata,









		      int ilen, void *odata, int olen, int flags)









{








@@ -280,6 +285,7 @@ static int ar5523_cmd(struct ar5523 *ar, u32 code, const void *idata,







	}



















	if (!wait_for_completion_timeout(&cmd->done, 2 * HZ)) {









		ar5523_cancel_tx_cmd(ar);









		cmd->odata = NULL;









		ar5523_err(ar, "timeout waiting for command %02x reply\n",









			   code);
































drivers/net/wireless/ath/ath10k/core.c



+16
−0






























Original line number
Diff line number
Diff line







@@ -99,6 +99,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {







		.dynamic_sar_support = false,









		.hw_restart_disconnect = false,









		.use_fw_tx_credits = true,









		.delay_unmap_buffer = false,









	},









	{









		.id = QCA988X_HW_2_0_VERSION,








@@ -138,6 +139,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {







		.dynamic_sar_support = false,









		.hw_restart_disconnect = false,









		.use_fw_tx_credits = true,









		.delay_unmap_buffer = false,









	},









	{









		.id = QCA9887_HW_1_0_VERSION,








@@ -178,6 +180,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {







		.dynamic_sar_support = false,









		.hw_restart_disconnect = false,









		.use_fw_tx_credits = true,









		.delay_unmap_buffer = false,









	},









	{









		.id = QCA6174_HW_3_2_VERSION,








@@ -213,6 +216,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {







		.dynamic_sar_support = true,









		.hw_restart_disconnect = false,









		.use_fw_tx_credits = true,









		.delay_unmap_buffer = false,









	},









	{









		.id = QCA6174_HW_2_1_VERSION,








@@ -252,6 +256,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {







		.dynamic_sar_support = false,









		.hw_restart_disconnect = false,









		.use_fw_tx_credits = true,









		.delay_unmap_buffer = false,









	},









	{









		.id = QCA6174_HW_2_1_VERSION,








@@ -291,6 +296,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {







		.dynamic_sar_support = false,









		.hw_restart_disconnect = false,









		.use_fw_tx_credits = true,









		.delay_unmap_buffer = false,









	},









	{









		.id = QCA6174_HW_3_0_VERSION,








@@ -330,6 +336,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {







		.dynamic_sar_support = false,









		.hw_restart_disconnect = false,









		.use_fw_tx_credits = true,









		.delay_unmap_buffer = false,









	},









	{









		.id = QCA6174_HW_3_2_VERSION,








@@ -373,6 +380,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {







		.dynamic_sar_support = true,









		.hw_restart_disconnect = false,









		.use_fw_tx_credits = true,









		.delay_unmap_buffer = false,









	},









	{









		.id = QCA99X0_HW_2_0_DEV_VERSION,








@@ -418,6 +426,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {







		.dynamic_sar_support = false,









		.hw_restart_disconnect = false,









		.use_fw_tx_credits = true,









		.delay_unmap_buffer = false,









	},









	{









		.id = QCA9984_HW_1_0_DEV_VERSION,








@@ -470,6 +479,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {







		.dynamic_sar_support = false,









		.hw_restart_disconnect = false,









		.use_fw_tx_credits = true,









		.delay_unmap_buffer = false,









	},









	{









		.id = QCA9888_HW_2_0_DEV_VERSION,








@@ -519,6 +529,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {







		.dynamic_sar_support = false,









		.hw_restart_disconnect = false,









		.use_fw_tx_credits = true,









		.delay_unmap_buffer = false,









	},









	{









		.id = QCA9377_HW_1_0_DEV_VERSION,








@@ -558,6 +569,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {







		.dynamic_sar_support = false,









		.hw_restart_disconnect = false,









		.use_fw_tx_credits = true,









		.delay_unmap_buffer = false,









	},









	{









		.id = QCA9377_HW_1_1_DEV_VERSION,








@@ -599,6 +611,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {







		.dynamic_sar_support = false,









		.hw_restart_disconnect = false,









		.use_fw_tx_credits = true,









		.delay_unmap_buffer = false,









	},









	{









		.id = QCA9377_HW_1_1_DEV_VERSION,








@@ -631,6 +644,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {







		.dynamic_sar_support = false,









		.hw_restart_disconnect = false,









		.use_fw_tx_credits = true,









		.delay_unmap_buffer = false,









	},









	{









		.id = QCA4019_HW_1_0_DEV_VERSION,








@@ -677,6 +691,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {







		.dynamic_sar_support = false,









		.hw_restart_disconnect = false,









		.use_fw_tx_credits = true,









		.delay_unmap_buffer = false,









	},









	{









		.id = WCN3990_HW_1_0_DEV_VERSION,








@@ -709,6 +724,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {







		.dynamic_sar_support = true,









		.hw_restart_disconnect = true,









		.use_fw_tx_credits = false,









		.delay_unmap_buffer = true,









	},









};