Skip to contentSkip to conversation

ath11k (gcc13): synchronize ath11k_mac_he_gi_to_nl80211_he_gi()'s return type

PATCH In review Jiri Slaby (SUSE) 4 participants 11 messages Oct 31, 2022 – Nov 3, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ath11k (gcc13): 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 <[email protected]>
Cc Kalle Valo <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>
---
 drivers/net/wireless/ath/ath11k/mac.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/mac.h +1 -1
index 2a0d3afb0c99..0231783ad754 100644
@@ -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);
Signature · 7 lines
2.38.1


-- 
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Jiri Slaby (SUSE)

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.

Quoted 10 lines
Cc Martin Liska <[email protected]>
Cc Kalle Valo <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>

Suggest the subject should be
wifi: ath11k: synchronize ath11k_mac_he_gi_to_nl80211_he_gi()'s return type

The reference to gcc in the description should be sufficient.

Kalle can update this when he merges

Quoted 17 lines
---
  drivers/net/wireless/ath/ath11k/mac.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/mac.h +1 -1
index 2a0d3afb0c99..0231783ad754 100644
@@ -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);
Signature · 3 lines
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k
author
#2 lore raw
Quoted 20 lines · Jeff Johnson
Quoted 8 lines · Jiri Slaby (SUSE)

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.

Quoted 10 lines
Cc Martin Liska <[email protected]>
Cc Kalle Valo <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>
Quoted 2 lines

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
Quoted 3 lines

The reference to gcc in the description should be sufficient.

Kalle can update this when he merges

OK, thanks.

Quoted 20 lines
Quoted 17 lines

---
  drivers/net/wireless/ath/ath11k/mac.h | 2 +-

  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/mac.h +1 -1
index 2a0d3afb0c99..0231783ad754 100644
@@ -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);
Signature · 2 lines
js
suse labs
#3 lore raw
Quoted 41 lines · Jiri Slaby
Quoted 25 lines · Jeff Johnson
Quoted 13 lines · Jiri Slaby (SUSE)

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.

Quoted 10 lines
Cc Martin Liska <[email protected]>
Cc Kalle Valo <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>
Quoted 2 lines

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
Quoted 8 lines
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

Yeah, using "wifi:" is a new prefix we started using with wireless patches this year.

Signature · 8 lines
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

-- 
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k
#4 lore raw
Quoted 29 lines · Kalle Valo
Quoted 18 lines · Jiri Slaby
Quoted 4 lines · Jeff Johnson

On 10/31/2022 4:43 AM, Jiri Slaby (SUSE) wrote:

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
Quoted 8 lines
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
Quoted 3 lines

Yeah, using "wifi:" is a new prefix we started using with wireless patches this year.

It would be nice if that was documented somewhere...

Signature · 6 lines
~Randy

-- 
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k
#5 lore raw
Quoted 30 lines · Randy Dunlap
Quoted 29 lines · Kalle Valo
Quoted 26 lines · Jiri Slaby
Quoted 4 lines · Jeff Johnson

On 10/31/2022 4:43 AM, Jiri Slaby (SUSE) wrote:

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
Quoted 5 lines
Quoted 3 lines

Yeah, using "wifi:" is a new prefix we started using with wireless patches this year.

It would be nice if that was documented somewhere...

It is mentioned on our wiki but I doubt anyone reads it :)

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches#subject

Do let me know if there are other places which should have this info.

I did assume it will take at least a year or two before people get used to the new prefix, but my patchwork script has a check for this and it's trivial to fix the subject before I commit the patch. So hopefully the switch goes smoothly.

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
#6 lore raw

Hi--

Quoted 32 lines · Kalle Valo
Quoted 30 lines · Randy Dunlap
Quoted 29 lines · Kalle Valo
Quoted 26 lines · Jiri Slaby
Quoted 4 lines · Jeff Johnson

On 10/31/2022 4:43 AM, Jiri Slaby (SUSE) wrote:

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
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines

Yeah, using "wifi:" is a new prefix we started using with wireless patches this year.

It would be nice if that was documented somewhere...

It is mentioned on our wiki but I doubt anyone reads it :)

I think that you are correct. ;)

Quoted 3 lines

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches#subject

Do let me know if there are other places which should have this info.

Ideally it would be in the subsystem's profile document as described in the MAINTAINERS file:

P: Subsystem Profile document for more details submitting
patches to the given subsystem. This is either an in-tree file, or a URI. See Documentation/maintainer/maintainer-entry-profile.rst for details.

although that seems to be overkill IMHO just to add a prefix: setting.

You could just clone some other maintainer's Profile document and then modify it to anything that you would like to have in it as far as Maintaining and patching are concerned.

Quoted 4 lines

I did assume it will take at least a year or two before people get used to the new prefix, but my patchwork script has a check for this and it's trivial to fix the subject before I commit the patch. So hopefully the switch goes smoothly.

OK.

Thanks.

Signature · 6 lines
~Randy

-- 
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k
author
#9 lore raw
In reply to Kalle Valo
Quoted 4 lines · Kalle Valo

I did assume it will take at least a year or two before people get used to the new prefix, but my patchwork script has a check for this and it's trivial to fix the subject before I commit the patch. So hopefully the switch goes smoothly.

I think so. It will take some turnarounds for you before this starts appearing in git log output for every wireless driver. Then, people will start picking the prefix up from there ;).

thanks,

Signature · 2 lines
js
suse labs
#10 lore raw
In reply to Jiri Slaby (SUSE)
Quoted 8 lines · Jiri Slaby (SUSE)

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.

Quoted 12 lines

Patch applied to ath-next branch of ath.git, thanks.

dd1c23226945 wifi: ath11k: synchronize ath11k_mac_he_gi_to_nl80211_he_gi()'s return type

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
#7 lore raw
In reply to Randy Dunlap
Quoted 22 lines · Randy Dunlap
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines

Yeah, using "wifi:" is a new prefix we started using with wireless patches this year.

It would be nice if that was documented somewhere...

It is mentioned on our wiki but I doubt anyone reads it :)

I think that you are correct. ;)

Quoted 3 lines

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches#subject

Do let me know if there are other places which should have this info.

Ideally it would be in the subsystem's profile document as described in the MAINTAINERS file:

P: Subsystem Profile document for more details submitting
patches to the given subsystem. This is either an in-tree file, or a URI. See Documentation/maintainer/maintainer-entry-profile.rst for details.

Quoted 5 lines

although that seems to be overkill IMHO just to add a prefix: setting.

You could just clone some other maintainer's Profile document and then modify it to anything that you would like to have in it as far as Maintaining and patching are concerned.

Ah, we should add that doc for wireless. Thanks for the idea, I added that to my todo list.

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
#8 lore raw
Quoted 24 lines · Kalle Valo
Quoted 22 lines · Randy Dunlap
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines

Yeah, using "wifi:" is a new prefix we started using with wireless patches this year.

It would be nice if that was documented somewhere...

It is mentioned on our wiki but I doubt anyone reads it :)

I think that you are correct. ;)

Quoted 3 lines

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches#subject

Do let me know if there are other places which should have this info.

Ideally it would be in the subsystem's profile document as described in the MAINTAINERS file:

P: Subsystem Profile document for more details submitting
patches to the given subsystem. This is either an in-tree file, or a URI. See Documentation/maintainer/maintainer-entry-profile.rst for details.

Quoted 9 lines
Quoted 5 lines

although that seems to be overkill IMHO just to add a prefix: setting.

You could just clone some other maintainer's Profile document and then modify it to anything that you would like to have in it as far as Maintaining and patching are concerned.

Ah, we should add that doc for wireless. Thanks for the idea, I added that to my todo list.

Thank you. :)

Signature · 6 lines
~Randy

-- 
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k