This is a note to let you know that I've just added the patch titled
sfc (gcc13): synchronize ef100_enqueue_skb()'s return type
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sfc-gcc13-synchronize-ef100_enqueue_skb-s-return-type.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 3319dbb3e755398f254c3daa04b9030197137efe Mon Sep 17 00:00:00 2001
From: "Jiri Slaby (SUSE)" <jirislaby@xxxxxxxxxx>
Date: Mon, 31 Oct 2022 12:44:40 +0100
Subject: sfc (gcc13): synchronize ef100_enqueue_skb()'s return type
From: Jiri Slaby (SUSE) <jirislaby@xxxxxxxxxx>
commit 3319dbb3e755398f254c3daa04b9030197137efe upstream.
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.
Cc: Martin Liska <mliska@xxxxxxx>
Cc: Edward Cree <ecree.xilinx@xxxxxxxxx>
Cc: Martin Habets <habetsm.xilinx@xxxxxxxxx>
Signed-off-by: Jiri Slaby (SUSE) <jirislaby@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20221031114440.10461-1-jirislaby@xxxxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/sfc/ef100_tx.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/net/ethernet/sfc/ef100_tx.c
+++ b/drivers/net/ethernet/sfc/ef100_tx.c
@@ -333,7 +333,8 @@ void ef100_ev_tx(struct efx_channel *cha
* 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)
{
unsigned int old_insert_count = tx_queue->insert_count;
struct efx_nic *efx = tx_queue->efx;
Patches currently in stable-queue which might be from jirislaby@xxxxxxxxxx are
queue-5.10/bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch
queue-5.10/sfc-gcc13-synchronize-ef100_enqueue_skb-s-return-type.patch
