| Message ID | 20240712235150.99175-1-jhubbard@nvidia.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | selftests/net: fix gro.c compilation failure due to non-existent opt_ipproto_off | expand |
On 7/12/24 4:51 PM, John Hubbard wrote: > 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. This is the first time I've tried to fix something in linux-stable, and I'm not sure that I've made it completely clear. This is only for linux-6.6.y in linux-stable. thanks,
On Fri, Jul 12, 2024 at 05:01:38PM -0700, John Hubbard wrote: > On 7/12/24 4:51 PM, John Hubbard wrote: > > 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. > > This is the first time I've tried to fix something in linux-stable, and > I'm not sure that I've made it completely clear. This is only for > linux-6.6.y in linux-stable. This worked just fine, now queued up, thanks. greg k-h
diff --git a/tools/testing/selftests/net/gro.c b/tools/testing/selftests/net/gro.c index b204df4f3332..30024d0ed373 100644 --- 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);
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> --- tools/testing/selftests/net/gro.c | 3 --- 1 file changed, 3 deletions(-) base-commit: 2ced7518a03d002284999ed8336ffac462a358ec