From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 8 May 2023 06:02:07 +0000 (+0200)
Subject: 6.1-stable patches
X-Git-Tag: v5.15.111~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4faf7321b257db0e6abd7b6bb408bad466beeec7;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	sfc-gcc13-synchronize-ef100_enqueue_skb-s-return-type.patch
---

diff --git a/queue-6.1/series b/queue-6.1/series
index 5ae6e771973..cb46745cb2a 100644
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -612,3 +612,4 @@ wifi-ath11k-synchronize-ath11k_mac_he_gi_to_nl80211_he_gi-s-return-type.patch
 perf-auxtrace-fix-address-filter-entire-kernel-size.patch
 perf-intel-pt-fix-cyc-timestamps-after-standalone-cbr.patch
 block-blk-iocost-gcc13-keep-large-values-in-a-new-enum.patch
+sfc-gcc13-synchronize-ef100_enqueue_skb-s-return-type.patch
diff --git a/queue-6.1/sfc-gcc13-synchronize-ef100_enqueue_skb-s-return-type.patch b/queue-6.1/sfc-gcc13-synchronize-ef100_enqueue_skb-s-return-type.patch
new file mode 100644
index 00000000000..4aa28cdccdf
--- /dev/null
+++ b/queue-6.1/sfc-gcc13-synchronize-ef100_enqueue_skb-s-return-type.patch
@@ -0,0 +1,40 @@
+From 3319dbb3e755398f254c3daa04b9030197137efe Mon Sep 17 00:00:00 2001
+From: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
+Date: Mon, 31 Oct 2022 12:44:40 +0100
+Subject: sfc (gcc13): synchronize ef100_enqueue_skb()'s return type
+
+From: Jiri Slaby (SUSE) <jirislaby@kernel.org>
+
+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@suse.cz>
+Cc: Edward Cree <ecree.xilinx@gmail.com>
+Cc: Martin Habets <habetsm.xilinx@gmail.com>
+Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
+Link: https://lore.kernel.org/r/20221031114440.10461-1-jirislaby@kernel.org
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -367,7 +367,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)
+ {
+ 	return __ef100_enqueue_skb(tx_queue, skb, NULL);
+ }