From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 7 Aug 2023 07:33:47 +0000 (+0200)
Subject: 6.4-stable patches
X-Git-Tag: v4.14.321~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=65546a081642ebd2b82e4f19e81c8f43577e971a;p=thirdparty%2Fkernel%2Fstable-queue.git

6.4-stable patches

added patches:
	sunvnet-fix-sparc64-build-error-after-gso-code-split.patch
---

diff --git a/queue-6.4/series b/queue-6.4/series
index b3695e49021..7e7fc06dfbc 100644
--- a/queue-6.4/series
+++ b/queue-6.4/series
@@ -129,3 +129,4 @@ drm-ttm-check-null-pointer-before-accessing-when-swapping.patch
 drm-i915-fix-premature-release-of-request-s-reusable-memory.patch
 drm-i915-gt-cleanup-aux-invalidation-registers.patch
 revert-page-cache-fix-page_cache_next-prev_miss-off-by-one.patch
+sunvnet-fix-sparc64-build-error-after-gso-code-split.patch
diff --git a/queue-6.4/sunvnet-fix-sparc64-build-error-after-gso-code-split.patch b/queue-6.4/sunvnet-fix-sparc64-build-error-after-gso-code-split.patch
new file mode 100644
index 00000000000..1215578473a
--- /dev/null
+++ b/queue-6.4/sunvnet-fix-sparc64-build-error-after-gso-code-split.patch
@@ -0,0 +1,41 @@
+From d9ffa069e006fa2873b94fbf2387546942d4f85b Mon Sep 17 00:00:00 2001
+From: Stephen Rothwell <sfr@canb.auug.org.au>
+Date: Tue, 13 Jun 2023 16:46:39 +1000
+Subject: sunvnet: fix sparc64 build error after gso code split
+
+From: Stephen Rothwell <sfr@canb.auug.org.au>
+
+commit d9ffa069e006fa2873b94fbf2387546942d4f85b upstream.
+
+After merging the net-next tree, today's linux-next build (sparc64
+defconfig) failed like this:
+
+drivers/net/ethernet/sun/sunvnet_common.c: In function 'vnet_handle_offloads':
+drivers/net/ethernet/sun/sunvnet_common.c:1277:16: error: implicit declaration of function 'skb_gso_segment'; did you mean 'skb_gso_reset'? [-Werror=implicit-function-declaration]
+ 1277 |         segs = skb_gso_segment(skb, dev->features & ~NETIF_F_TSO);
+      |                ^~~~~~~~~~~~~~~
+      |                skb_gso_reset
+drivers/net/ethernet/sun/sunvnet_common.c:1277:14: warning: assignment to 'struct sk_buff *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
+ 1277 |         segs = skb_gso_segment(skb, dev->features & ~NETIF_F_TSO);
+      |              ^
+
+Fixes: d457a0e329b0 ("net: move gso declarations and functions to their own files")
+Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
+Reviewed-by: Simon Horman <simon.horman@corigine.com>
+Link: https://lore.kernel.org/r/20230613164639.164b2991@canb.auug.org.au
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/sun/sunvnet_common.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/ethernet/sun/sunvnet_common.c
++++ b/drivers/net/ethernet/sun/sunvnet_common.c
+@@ -25,6 +25,7 @@
+ #endif
+ 
+ #include <net/ip.h>
++#include <net/gso.h>
+ #include <net/icmp.h>
+ #include <net/route.h>
+