]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
selftests/net: fix gro.c compilation failure due to non-existent opt_ipproto_off
authorJohn Hubbard <jhubbard@nvidia.com>
Fri, 12 Jul 2024 23:51:50 +0000 (16:51 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Jul 2024 11:21:24 +0000 (13:21 +0200)
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@vger.kernel.org> # 6.6
Reported-by: Ignat Korchagin <ignat@cloudflare.com>
Closes: https://lore.kernel.org/all/8B1717DB-8C4A-47EE-B28C-170B630C4639@cloudflare.com/#t
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
tools/testing/selftests/net/gro.c

index b204df4f3332204247a64d6f0d055e5f4351a5a9..30024d0ed37391712b0d7eb93794a5fc8fa4e814 100644 (file)
@@ -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);