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

Merge tag 'wireless-next-2023-02-17' of... 

Merge tag 'wireless-next-2023-02-17' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next



Kalle Valo says:

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

Third set of patches for v6.3. This time only a set of small fixes
submitted during the last day or two.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1155a228 38ae3192

drivers/net/wireless/intel/iwlegacy/4965-mac.c

+1 −1
Original line number Diff line number Diff line
@@ -4020,7 +4020,7 @@ il4965_hdl_alive(struct il_priv *il, struct il_rx_buf *rxb) 


	if (palive->ver_subtype == INITIALIZE_SUBTYPE) {

		D_INFO("Initialization Alive received.\n");

		memcpy(&il->card_alive_init, &pkt->u.alive_frame,

		memcpy(&il->card_alive_init, &pkt->u.raw,

		       sizeof(struct il_init_alive_resp));

		pwork = &il->init_alive_start;

	} else {

drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c

+0 −7
Original line number Diff line number Diff line
@@ -438,13 +438,6 @@ static ssize_t iwl_dbgfs_bf_params_read(struct file *file, 
	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);

}



static inline char *iwl_dbgfs_is_match(char *name, char *buf)

{

	int len = strlen(name);



	return !strncmp(name, buf, len) ? buf + len : NULL;

}



static ssize_t iwl_dbgfs_os_device_timediff_read(struct file *file,

						 char __user *user_buf,

						 size_t count, loff_t *ppos)

drivers/net/wireless/realtek/rtl8xxxu/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
config RTL8XXXU

	tristate "Realtek 802.11n USB wireless chips support"

	depends on MAC80211 && USB

	depends on LEDS_CLASS

	help

	  This is an alternative driver for various Realtek RTL8XXX

	  parts written to utilize the Linux mac80211 stack.

drivers/net/wireless/realtek/rtw88/coex.c

+1 −1
Original line number Diff line number Diff line
@@ -4056,7 +4056,7 @@ void rtw_coex_display_coex_info(struct rtw_dev *rtwdev, struct seq_file *m) 
		   rtwdev->stats.tx_throughput, rtwdev->stats.rx_throughput);

	seq_printf(m, "%-40s = %u/ %u/ %u\n",

		   "IPS/ Low Power/ PS mode",

		   test_bit(RTW_FLAG_INACTIVE_PS, rtwdev->flags),

		   !test_bit(RTW_FLAG_POWERON, rtwdev->flags),

		   test_bit(RTW_FLAG_LEISURE_PS_DEEP, rtwdev->flags),

		   rtwdev->lps_conf.mode);

drivers/net/wireless/realtek/rtw88/mac.c

+10 −0
Original line number Diff line number Diff line
@@ -273,6 +273,11 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on) 
	if (rtw_pwr_seq_parser(rtwdev, pwr_seq))

		return -EINVAL;



	if (pwr_on)

		set_bit(RTW_FLAG_POWERON, rtwdev->flags);

	else

		clear_bit(RTW_FLAG_POWERON, rtwdev->flags);



	return 0;

}
@@ -335,6 +340,11 @@ int rtw_mac_power_on(struct rtw_dev *rtwdev) 
	ret = rtw_mac_power_switch(rtwdev, true);

	if (ret == -EALREADY) {

		rtw_mac_power_switch(rtwdev, false);



		ret = rtw_mac_pre_system_cfg(rtwdev);

		if (ret)

			goto err;



		ret = rtw_mac_power_switch(rtwdev, true);

		if (ret)

			goto err;