mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-25 09:07:30 +02:00
93ae4353cd
ath11k is the upstream driver for Qualcomm 802.11ax radios, both for the internal AHB and PCI based cards. This commit does however only provide PCI support while AHB will follow but its SoC specific so it will require an OpenWrt target first. It differs a bit from ath10k as it requires stuff like QRTR, MHI and QMI helpers. PCI variant requires qrtr-mhi and mhi-bus which backports do provide, however we are dropping those in a patch as they will conflict with support for the AHB variant as that one requires qrtr-smd which in turn requires RPMSG and GLINK and its not feasable to provide those in backports as they are really SoC specific. QRTR and MHI in kernel 5.10 are not usable and backporting the changes is not easy as they have changed drastically from 5.10 to 5.15 ath11k will only be available on targets that use kernel 5.15. Signed-off-by: Robert Marko <robimarko@gmail.com>
43 lines
2.1 KiB
Diff
43 lines
2.1 KiB
Diff
From dd1c2322694522f674c874f5fa02ac5ae39135dd Mon Sep 17 00:00:00 2001
|
|
From: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
|
|
Date: Mon, 31 Oct 2022 12:43:41 +0100
|
|
Subject: [PATCH] wifi: ath11k: synchronize
|
|
ath11k_mac_he_gi_to_nl80211_he_gi()'s return type
|
|
|
|
ath11k_mac_he_gi_to_nl80211_he_gi() generates a valid warning with gcc-13:
|
|
drivers/net/wireless/ath/ath11k/mac.c:321:20: error: conflicting types for 'ath11k_mac_he_gi_to_nl80211_he_gi' due to enum/integer mismatch; have 'enum nl80211_he_gi(u8)'
|
|
drivers/net/wireless/ath/ath11k/mac.h:166:5: note: previous declaration of 'ath11k_mac_he_gi_to_nl80211_he_gi' with type 'u32(u8)'
|
|
|
|
I.e. the type of the return value ath11k_mac_he_gi_to_nl80211_he_gi() in
|
|
the declaration is u32, while the definition spells enum nl80211_he_gi.
|
|
Synchronize them to the latter.
|
|
|
|
Cc: Martin Liska <mliska@suse.cz>
|
|
Cc: Kalle Valo <kvalo@kernel.org>
|
|
Cc: "David S. Miller" <davem@davemloft.net>
|
|
Cc: Eric Dumazet <edumazet@google.com>
|
|
Cc: Jakub Kicinski <kuba@kernel.org>
|
|
Cc: Paolo Abeni <pabeni@redhat.com>
|
|
Cc: ath11k@lists.infradead.org
|
|
Cc: linux-wireless@vger.kernel.org
|
|
Cc: netdev@vger.kernel.org
|
|
Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
|
|
Reviewed-by: Jeff Johnson <quic_jjohnson@quicinc.com>
|
|
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
|
|
Link: https://lore.kernel.org/r/20221031114341.10377-1-jirislaby@kernel.org
|
|
---
|
|
drivers/net/wireless/ath/ath11k/mac.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/mac.h
|
|
+++ b/drivers/net/wireless/ath/ath11k/mac.h
|
|
@@ -163,7 +163,7 @@ void ath11k_mac_drain_tx(struct ath11k *
|
|
void ath11k_mac_peer_cleanup_all(struct ath11k *ar);
|
|
int ath11k_mac_tx_mgmt_pending_free(int buf_id, void *skb, void *ctx);
|
|
u8 ath11k_mac_bw_to_mac80211_bw(u8 bw);
|
|
-u32 ath11k_mac_he_gi_to_nl80211_he_gi(u8 sgi);
|
|
+enum nl80211_he_gi ath11k_mac_he_gi_to_nl80211_he_gi(u8 sgi);
|
|
enum nl80211_he_ru_alloc ath11k_mac_phy_he_ru_to_nl80211_he_ru_alloc(u16 ru_phy);
|
|
enum nl80211_he_ru_alloc ath11k_mac_he_ru_tones_to_nl80211_he_ru_alloc(u16 ru_tones);
|
|
enum ath11k_supported_bw ath11k_mac_mac80211_bw_to_ath11k_bw(enum rate_info_bw bw);
|