Commit 1fa6ffad authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-next-2023-08-25' of... 

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

Kalle Valo says:

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

The second pull request for v6.6, this time with both stack and driver
changes. Unusually we have only one major new feature but lots of
small cleanup all over, I guess this is due to people have been on
vacation the last month.

Major changes:

rtw89
 - Introduce Time Averaged SAR (TAS) support

* tag 'wireless-next-2023-08-25' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (114 commits)
  wifi: rtlwifi: rtl8723: Remove unused function rtl8723_cmd_send_packet()
  wifi: rtw88: usb: kill and free rx urbs on probe failure
  wifi: rtw89: Fix clang -Wimplicit-fallthrough in rtw89_query_sar()
  wifi: rtw89: phy: modify register setting of ENV_MNTR, PHYSTS and DIG
  wifi: rtw89: phy: add phy_gen_def::cr_base to support WiFi 7 chips
  wifi: rtw89: mac: define register address of rx_filter to generalize code
  wifi: rtw89: mac: define internal memory address for WiFi 7 chip
  wifi: rtw89: mac: generalize code to indirectly access WiFi internal memory
  wifi: rtw89: mac: add mac_gen_def::band1_offset to map MAC band1 register address
  wifi: wlcore: sdio: Use module_sdio_driver macro to simplify the code
  wifi: rtw89: initialize multi-channel handling
  wifi: rtw89: provide functions to configure NoA for beacon update
  wifi: rtw89: call rtw89_chan_get() by vif chanctx if aware of vif
  wifi: rtw89: sar: let caller decide the center frequency to query
  wifi: rtw89: refine rtw89_correct_cck_chan() by rtw89_hw_to_nl80211_band()
  wifi: rtw89: add function prototype for coex request duration
  Fix nomenclature for USB and PCI wireless devices
  wifi: ath: Use is_multicast_ether_addr() to check multicast Ether address
  wifi: ath12k: Remove unused declarations
  wifi: ath12k: add check max message length while scanning with extraie
  ...
====================

Link: https://lore.kernel.org/r/20230825132230.A0833C433C8@smtp.kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3db34747 4dddbad8

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

+1 −1
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ static int ath10k_ahb_probe(struct platform_device *pdev) 
	int ret;

	struct ath10k_bus_params bus_params = {};



	hw_rev = (enum ath10k_hw_rev)of_device_get_match_data(&pdev->dev);

	hw_rev = (uintptr_t)of_device_get_match_data(&pdev->dev);

	if (!hw_rev) {

		dev_err(&pdev->dev, "OF data missing\n");

		return -EINVAL;

drivers/net/wireless/ath/ath10k/htt.h

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ struct htt_ver_req { 
 * The HTT tx descriptor is defined in two manners: by a struct with

 * bitfields, and by a series of [dword offset, bit mask, bit shift]

 * definitions.

 * The target should use the struct def, for simplicitly and clarity,

 * The target should use the struct def, for simplicity and clarity,

 * but the host shall use the bit-mast + bit-shift defs, to be endian-

 * neutral.  Specifically, the host shall use the get/set macros built

 * around the mask + shift defs.
@@ -2086,7 +2086,7 @@ static inline bool ath10k_htt_rx_proc_rx_frag_ind(struct ath10k_htt *htt, 
 * for correctly accessing rx descriptor data.

 */



/* base struct used for abstracting the rx descritor representation */

/* base struct used for abstracting the rx descriptor representation */

struct htt_rx_desc {

	union {

		/* This field is filled on the host using the msdu buffer

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

+2 −2
Original line number Diff line number Diff line
@@ -1636,7 +1636,7 @@ static int ath10k_pci_dump_memory_generic(struct ath10k *ar, 
						      buf,

						      current_region->len);



	/* No individiual memory sections defined so we can

	/* No individual memory sections defined so we can

	 * copy the entire memory region.

	 */

	ret = ath10k_pci_diag_read_mem(ar,
@@ -3816,7 +3816,7 @@ static void __exit ath10k_pci_exit(void) 
module_exit(ath10k_pci_exit);



MODULE_AUTHOR("Qualcomm Atheros");

MODULE_DESCRIPTION("Driver support for Qualcomm Atheros 802.11ac WLAN PCIe/AHB devices");

MODULE_DESCRIPTION("Driver support for Qualcomm Atheros PCIe/AHB 802.11ac WLAN devices");

MODULE_LICENSE("Dual BSD/GPL");



/* QCA988x 2.0 firmware files */

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

+1 −1
Original line number Diff line number Diff line
@@ -2389,7 +2389,7 @@ static int ath10k_sdio_dump_memory_generic(struct ath10k *ar, 
						      buf,

						      current_region->len);



	/* No individiual memory sections defined so we can

	/* No individual memory sections defined so we can

	 * copy the entire memory region.

	 */

	if (fast_dump)

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

+1 −1
Original line number Diff line number Diff line
@@ -1126,5 +1126,5 @@ static struct usb_driver ath10k_usb_driver = { 
module_usb_driver(ath10k_usb_driver);



MODULE_AUTHOR("Atheros Communications, Inc.");

MODULE_DESCRIPTION("Driver support for Qualcomm Atheros 802.11ac WLAN USB devices");

MODULE_DESCRIPTION("Driver support for Qualcomm Atheros USB 802.11ac WLAN devices");

MODULE_LICENSE("Dual BSD/GPL");