From: Greg Kroah-Hartman <gregkh@linuxfoundation•org>
To: stable@vger•kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
patches@lists•linux.dev, Martin Liska <mliska@suse•cz>,
Kalle Valo <kvalo@kernel•org>,
"David S. Miller" <davem@davemloft•net>,
Eric Dumazet <edumazet@google•com>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>,
ath11k@lists•infradead.org, linux-wireless@vger•kernel.org,
netdev@vger•kernel.org,
"Jiri Slaby (SUSE)" <jirislaby@kernel•org>,
Jeff Johnson <quic_jjohnson@quicinc•com>,
Kalle Valo <quic_kvalo@quicinc•com>
Subject: [PATCH 6.1 601/611] wifi: ath11k: synchronize ath11k_mac_he_gi_to_nl80211_he_gi()s return type
Date: Mon, 8 May 2023 11:47:23 +0200 [thread overview]
Message-ID: <20230508094441.433673192@linuxfoundation.org> (raw)
In-Reply-To: <20230508094421.513073170@linuxfoundation.org>
From: Jiri Slaby (SUSE) <jirislaby@kernel•org>
commit dd1c2322694522f674c874f5fa02ac5ae39135dd upstream.
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
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation•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);
prev parent reply other threads:[~2023-05-08 10:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20230508094421.513073170@linuxfoundation.org>
2023-05-08 9:37 ` [PATCH 6.1 009/611] net: wwan: t7xx: do not compile with -Werror Greg Kroah-Hartman
2023-05-08 9:47 ` Greg Kroah-Hartman [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230508094441.433673192@linuxfoundation.org \
--to=gregkh@linuxfoundation$(echo .)org \
--cc=ath11k@lists$(echo .)infradead.org \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=jirislaby@kernel$(echo .)org \
--cc=kuba@kernel$(echo .)org \
--cc=kvalo@kernel$(echo .)org \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=mliska@suse$(echo .)cz \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=patches@lists$(echo .)linux.dev \
--cc=quic_jjohnson@quicinc$(echo .)com \
--cc=quic_kvalo@quicinc$(echo .)com \
--cc=stable@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox