sfc (gcc13): synchronize ef100_enqueue_skb()'s return type
Subsystems (3)
PATCH 1/1 sfc (gcc13): synchronize ef100_enqueue_skb()'s return type
ef100_enqueue_skb() generates a valid warning with gcc-13:
drivers/net/ethernet/sfc/ef100_tx.c:370:5: error: conflicting types for 'ef100_enqueue_skb' due to enum/integer mismatch; have 'int(struct efx_tx_queue *, struct sk_buff *)' drivers/net/ethernet/sfc/ef100_tx.h:25:13: note: previous declaration of 'ef100_enqueue_skb' with type 'netdev_tx_t(struct efx_tx_queue *, struct sk_buff *)'
I.e. the type of the ef100_enqueue_skb()'s return value in the declaration is int, while the definition spells enum netdev_tx_t. Synchronize them to the latter.
--- drivers/net/ethernet/sfc/ef100_tx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/sfc/ef100_tx.c +2 -1
@@ -367,7 +367,8 @@ void ef100_ev_tx(struct efx_channel *channel, const efx_qword_t *p_event)* Returns 0 on success, error code otherwise. In case of an error this * function will free the SKB. */ -int ef100_enqueue_skb (struct efx_tx_queue *tx_queue,struct sk_buff *skb) +netdev_tx_t ef100_enqueue_skb (struct efx_tx_queue *tx_queue, +struct sk_buff *skb) {return __ef100_enqueue_skb (tx_queue, skb,NULL ); }
Signature · 1 line
2.38.1
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Mon, 31 Oct 2022 12:44:40 +0100 you wrote:
ef100_enqueue_skb()generates a valid warning with gcc-13:
drivers/net/ethernet/sfc/ef100_tx.c:370:5: error: conflicting types for 'ef100_enqueue_skb' due to enum/integer mismatch; have 'int(struct efx_tx_queue *, struct sk_buff *)'drivers/net/ethernet/sfc/ef100_tx.h:25:13: note: previous declaration of 'ef100_enqueue_skb' with type 'netdev_tx_t(struct efx_tx_queue *, struct sk_buff *)'I.e. the type of the ef100_enqueue_skb()'s return value in the declaration is int, while the definition spells enum
netdev_tx_t. Synchronize them to the latter.[...]
Here is the summary with links:
- sfc (gcc13): synchronize ef100_enqueue_skb()'s return type
https://git.kernel.org/netdev/net-next/c/3319dbb3e755
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html