Skip to content

Commit 1fa6ffa

Browse files
committed
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: Jakub Kicinski <kuba@kernel.org>
2 parents 3db3474 + 4dddbad commit 1fa6ffa

150 files changed

Lines changed: 2232 additions & 1155 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ static int ath10k_ahb_probe(struct platform_device *pdev)
733733
int ret;
734734
struct ath10k_bus_params bus_params = {};
735735

736-
hw_rev = (enum ath10k_hw_rev)of_device_get_match_data(&pdev->dev);
736+
hw_rev = (uintptr_t)of_device_get_match_data(&pdev->dev);
737737
if (!hw_rev) {
738738
dev_err(&pdev->dev, "OF data missing\n");
739739
return -EINVAL;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ struct htt_ver_req {
6969
* The HTT tx descriptor is defined in two manners: by a struct with
7070
* bitfields, and by a series of [dword offset, bit mask, bit shift]
7171
* definitions.
72-
* The target should use the struct def, for simplicitly and clarity,
72+
* The target should use the struct def, for simplicity and clarity,
7373
* but the host shall use the bit-mast + bit-shift defs, to be endian-
7474
* neutral. Specifically, the host shall use the get/set macros built
7575
* around the mask + shift defs.
@@ -2086,7 +2086,7 @@ static inline bool ath10k_htt_rx_proc_rx_frag_ind(struct ath10k_htt *htt,
20862086
* for correctly accessing rx descriptor data.
20872087
*/
20882088

2089-
/* base struct used for abstracting the rx descritor representation */
2089+
/* base struct used for abstracting the rx descriptor representation */
20902090
struct htt_rx_desc {
20912091
union {
20922092
/* This field is filled on the host using the msdu buffer

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1636,7 +1636,7 @@ static int ath10k_pci_dump_memory_generic(struct ath10k *ar,
16361636
buf,
16371637
current_region->len);
16381638

1639-
/* No individiual memory sections defined so we can
1639+
/* No individual memory sections defined so we can
16401640
* copy the entire memory region.
16411641
*/
16421642
ret = ath10k_pci_diag_read_mem(ar,
@@ -3816,7 +3816,7 @@ static void __exit ath10k_pci_exit(void)
38163816
module_exit(ath10k_pci_exit);
38173817

38183818
MODULE_AUTHOR("Qualcomm Atheros");
3819-
MODULE_DESCRIPTION("Driver support for Qualcomm Atheros 802.11ac WLAN PCIe/AHB devices");
3819+
MODULE_DESCRIPTION("Driver support for Qualcomm Atheros PCIe/AHB 802.11ac WLAN devices");
38203820
MODULE_LICENSE("Dual BSD/GPL");
38213821

38223822
/* QCA988x 2.0 firmware files */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2389,7 +2389,7 @@ static int ath10k_sdio_dump_memory_generic(struct ath10k *ar,
23892389
buf,
23902390
current_region->len);
23912391

2392-
/* No individiual memory sections defined so we can
2392+
/* No individual memory sections defined so we can
23932393
* copy the entire memory region.
23942394
*/
23952395
if (fast_dump)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1126,5 +1126,5 @@ static struct usb_driver ath10k_usb_driver = {
11261126
module_usb_driver(ath10k_usb_driver);
11271127

11281128
MODULE_AUTHOR("Atheros Communications, Inc.");
1129-
MODULE_DESCRIPTION("Driver support for Qualcomm Atheros 802.11ac WLAN USB devices");
1129+
MODULE_DESCRIPTION("Driver support for Qualcomm Atheros USB 802.11ac WLAN devices");
11301130
MODULE_LICENSE("Dual BSD/GPL");

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3854,9 +3854,9 @@ enum wmi_pdev_param {
38543854
* retransmitting frames.
38553855
*/
38563856
WMI_PDEV_PARAM_DYNAMIC_BW,
3857-
/* Non aggregrate/ 11g sw retry threshold.0-disable */
3857+
/* Non aggregate/ 11g sw retry threshold.0-disable */
38583858
WMI_PDEV_PARAM_NON_AGG_SW_RETRY_TH,
3859-
/* aggregrate sw retry threshold. 0-disable*/
3859+
/* aggregate sw retry threshold. 0-disable*/
38603860
WMI_PDEV_PARAM_AGG_SW_RETRY_TH,
38613861
/* Station kickout threshold (non of consecutive failures).0-disable */
38623862
WMI_PDEV_PARAM_STA_KICKOUT_TH,
@@ -3953,9 +3953,9 @@ enum wmi_10x_pdev_param {
39533953
WMI_10X_PDEV_PARAM_PROTECTION_MODE,
39543954
/* Dynamic bandwidth 0: disable 1: enable */
39553955
WMI_10X_PDEV_PARAM_DYNAMIC_BW,
3956-
/* Non aggregrate/ 11g sw retry threshold.0-disable */
3956+
/* Non aggregate/ 11g sw retry threshold.0-disable */
39573957
WMI_10X_PDEV_PARAM_NON_AGG_SW_RETRY_TH,
3958-
/* aggregrate sw retry threshold. 0-disable*/
3958+
/* aggregate sw retry threshold. 0-disable*/
39593959
WMI_10X_PDEV_PARAM_AGG_SW_RETRY_TH,
39603960
/* Station kickout threshold (non of consecutive failures).0-disable */
39613961
WMI_10X_PDEV_PARAM_STA_KICKOUT_TH,

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ static int ath11k_ahb_probe(struct platform_device *pdev)
10961096
return -EINVAL;
10971097
}
10981098

1099-
hw_rev = (enum ath11k_hw_rev)of_id->data;
1099+
hw_rev = (uintptr_t)of_id->data;
11001100

11011101
switch (hw_rev) {
11021102
case ATH11K_HW_IPQ8074:
@@ -1306,17 +1306,7 @@ static struct platform_driver ath11k_ahb_driver = {
13061306
.shutdown = ath11k_ahb_shutdown,
13071307
};
13081308

1309-
static int ath11k_ahb_init(void)
1310-
{
1311-
return platform_driver_register(&ath11k_ahb_driver);
1312-
}
1313-
module_init(ath11k_ahb_init);
1314-
1315-
static void ath11k_ahb_exit(void)
1316-
{
1317-
platform_driver_unregister(&ath11k_ahb_driver);
1318-
}
1319-
module_exit(ath11k_ahb_exit);
1309+
module_platform_driver(ath11k_ahb_driver);
13201310

13211311
MODULE_DESCRIPTION("Driver support for Qualcomm Technologies 802.11ax WLAN AHB devices");
13221312
MODULE_LICENSE("Dual BSD/GPL");

drivers/net/wireless/ath/ath11k/ce.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,6 @@ int ath11k_ce_alloc_pipes(struct ath11k_base *ab);
203203
void ath11k_ce_free_pipes(struct ath11k_base *ab);
204204
int ath11k_ce_get_attr_flags(struct ath11k_base *ab, int ce_id);
205205
void ath11k_ce_poll_send_completed(struct ath11k_base *ab, u8 pipe_id);
206-
int ath11k_ce_map_service_to_pipe(struct ath11k_base *ab, u16 service_id,
207-
u8 *ul_pipe, u8 *dl_pipe);
208-
int ath11k_ce_attr_attach(struct ath11k_base *ab);
209206
void ath11k_ce_get_shadow_config(struct ath11k_base *ab,
210207
u32 **shadow_cfg, u32 *shadow_cfg_len);
211208
void ath11k_ce_stop_shadow_timers(struct ath11k_base *ab);

drivers/net/wireless/ath/ath11k/dp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ enum htt_ppdu_stats_tag_type {
635635
* b'24 - status_swap: 1 is to swap status TLV
636636
* b'25 - pkt_swap: 1 is to swap packet TLV
637637
* b'26:31 - rsvd1: reserved for future use
638-
* dword1 - b'0:16 - ring_buffer_size: size of bufferes referenced by rx ring,
638+
* dword1 - b'0:16 - ring_buffer_size: size of buffers referenced by rx ring,
639639
* in byte units.
640640
* Valid only for HW_TO_SW_RING and SW_TO_HW_RING
641641
* - b'16:31 - rsvd2: Reserved for future use

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3423,7 +3423,7 @@ static int ath11k_dp_rx_h_defrag_reo_reinject(struct ath11k *ar, struct dp_rx_ti
34233423
ath11k_hal_rx_buf_addr_info_set(msdu0, paddr, cookie,
34243424
ab->hw_params.hal_params->rx_buf_rbm);
34253425

3426-
/* Fill mpdu details into reo entrace ring */
3426+
/* Fill mpdu details into reo entrance ring */
34273427
srng = &ab->hal.srng_list[ab->dp.reo_reinject_ring.ring_id];
34283428

34293429
spin_lock_bh(&srng->lock);

0 commit comments

Comments
 (0)