Re: [PATCH] ath11k (gcc13): synchronize ath11k_mac_he_gi_to_nl80211_he_gi()'s return type

[Jiri Slaby]

On 31. 10. 22, 22:16, Jeff Johnson wrote:
> On 10/31/2022 4:43 AM, Jiri Slaby (SUSE) wrote:
> > 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@xxxxxxx>
> > Cc: Kalle Valo <kvalo@xxxxxxxxxx>
> > Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
> > Cc: Eric Dumazet <edumazet@xxxxxxxxxx>
> > Cc: Jakub Kicinski <kuba@xxxxxxxxxx>
> > Cc: Paolo Abeni <pabeni@xxxxxxxxxx>
> > Cc: ath11k@xxxxxxxxxxxxxxxxxxx
> > Cc: linux-wireless@xxxxxxxxxxxxxxx
> > Cc: netdev@xxxxxxxxxxxxxxx
> > Signed-off-by: Jiri Slaby (SUSE) <jirislaby@xxxxxxxxxx>
>
> Suggest the subject should be
> wifi: ath11k: synchronize ath11k_mac_he_gi_to_nl80211_he_gi()'s return type

FWIW I copied from:
$ git log --format=%s  drivers/net/wireless/ath/ath11k/mac.h
ath11k: Handle keepalive during WoWLAN suspend and resume
ath11k: reduce the wait time of 11d scan and hw scan while add interface
ath11k: Add basic WoW functionalities
ath11k: add support for hardware rfkill for QCA6390
ath11k: report tx bitrate for iw wlan station dump
ath11k: add 11d scan offload support
ath11k: fix read fail for htt_stats and htt_peer_stats for single pdev
ath11k: add support for BSS color change
ath11k: add support for 80P80 and 160 MHz bandwidth
ath11k: Add support for STA to handle beacon miss
ath11k: add support to configure spatial reuse parameter set
ath11k: remove "ath11k_mac_get_ar_vdev_stop_status" references
ath11k: Perform per-msdu rx processing
ath11k: fix incorrect peer stats counters update
ath11k: Move mac80211 hw allocation before wmi_init command
ath11k: fix missed bw conversion in tx completion
ath11k: driver for Qualcomm IEEE 802.11ax devices

> The reference to gcc in the description should be sufficient.
>
> Kalle can update this when he merges

OK, thanks.

> Reviewed-by: Jeff Johnson <quic_jjohnson@xxxxxxxxxxx>
>
> > ---
> >   drivers/net/wireless/ath/ath11k/mac.h | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/wireless/ath/ath11k/mac.h 
> > b/drivers/net/wireless/ath/ath11k/mac.h
> > index 2a0d3afb0c99..0231783ad754 100644
> > --- 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 *ar);
> >   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);

--
js
suse labs