Patch "[PATCH] selftests/net: fix gro.c compilation failure due to non-existent opt_ipproto_off" has been added to the 6.6-stable tree

[gregkh at linuxfoundation.org]

This is a note to let you know that I've just added the patch titled

    [PATCH] selftests/net: fix gro.c compilation failure due to non-existent opt_ipproto_off

to the 6.6-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:
     selftests-net-fix-gro.c-compilation-failure-due-to-non-existent-opt_ipproto_off.patch
and it can be found in the queue-6.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable at vger.kernel.org> know about it.


>From jhubbard at nvidia.com  Mon Jul 15 14:10:26 2024
From: John Hubbard <jhubbard at nvidia.com>
Date: Fri, 12 Jul 2024 16:51:50 -0700
Subject: [PATCH] selftests/net: fix gro.c compilation failure due to non-existent opt_ipproto_off
To: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Cc: "Shuah Khan" <shuah at kernel.org>, "David S . Miller" <davem at davemloft.net>, "Eric Dumazet" <edumazet at google.com>, "Jakub Kicinski" <kuba at kernel.org>, "Paolo Abeni" <pabeni at redhat.com>, "Steffen Klassert" <steffen.klassert at secunet.com>, "Herbert Xu" <herbert at gondor.apana.org.au>, "Andreas Färber" <afaerber at suse.de>, "Manivannan Sadhasivam" <manivannan.sadhasivam at linaro.org>, "Matthieu Baerts" <matttbe at kernel.org>, "Mat Martineau" <martineau at kernel.org>, "Geliang Tang" <geliang at kernel.org>, "Pravin B Shelar" <pshelar at ovn.org>, "Willem de Bruijn" <willemdebruijn.kernel at gmail.com>, "Alexander Mikhalitsyn" <alexander at mihalicyn.com>, zhujun2 <zhujun2 at cmss.chinamobile.com>, "Petr Machata" <petrm at nvidia.com>, "Ido Schimmel" <idosch at nvidia.com>, "Hangbin Liu" <liuhangbin at gmail.com>, "Nikolay Aleksandrov" <razor at blackwall.org>, "Benjamin Poirier" <bpoirier at nvidia.com>, "Sebastian Andrzej Siewior" <bigeasy at linutronix.de>, "Dmitry Safonov" <0x7f454c46 at gmail.com>, netdev at vger.kernel.org, linux
 -arm-kernel at lists.infradead.org, linux-actions at lists.infradead.org, mptcp at lists.linux.dev, dev at openvswitch.org, linux-kselftest at vger.kernel.org, LKML <linux-kernel at vger.kernel.org>, llvm at lists.linux.dev, "John Hubbard" <jhubbard at nvidia.com>, stable at vger.kernel.org, "Ignat Korchagin" <ignat at cloudflare.com>
Message-ID: <20240712235150.99175-1-jhubbard at nvidia.com>

From: John Hubbard <jhubbard at nvidia.com>

Linux 6.6 does not have an opt_ipproto_off variable in gro.c at all (it
was added in later kernel versions), so attempting to initialize one
breaks the build.

Fixes: c80d53c484e8 ("selftests/net: fix uninitialized variables")
Cc: <stable at vger.kernel.org> # 6.6
Reported-by: Ignat Korchagin <ignat at cloudflare.com>
Closes: https://lore.kernel.org/all/8B1717DB-8C4A-47EE-B28C-170B630C4639@cloudflare.com/#t
Signed-off-by: John Hubbard <jhubbard at nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 tools/testing/selftests/net/gro.c |    3 ---
 1 file changed, 3 deletions(-)

--- a/tools/testing/selftests/net/gro.c
+++ b/tools/testing/selftests/net/gro.c
@@ -113,9 +113,6 @@ static void setup_sock_filter(int fd)
 		next_off = offsetof(struct ipv6hdr, nexthdr);
 	ipproto_off = ETH_HLEN + next_off;
 
-	/* Overridden later if exthdrs are used: */
-	opt_ipproto_off = ipproto_off;
-
 	if (strcmp(testname, "ip") == 0) {
 		if (proto == PF_INET)
 			optlen = sizeof(struct ip_timestamp);


Patches currently in stable-queue which might be from jhubbard at nvidia.com are

queue-6.6/selftests-net-fix-gro.c-compilation-failure-due-to-non-existent-opt_ipproto_off.patch