From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 27DCC1D222B; Wed, 2 Oct 2024 14:34:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727879688; cv=none; b=oYeF7ngYF0HSz/TXywxWneRkck3uCJD14mooVTx7gCA/tnroxcNT1F3JLrzSWPHxmuEPs2pr4ilJR5P5KgpUdX5yJccMmQNtje4ShDkoJlAWCgdDMPNsK/f/6BmqsCJPSuWpb9tardoZ/YzF1HbDD/hz6WzXAT+eGNzbdDJdClU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727879688; c=relaxed/simple; bh=N5FEYhNDs5ES9KYrTNgYYm6nFtawYb8A1vyUm5NIxKA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dz1fv2S8U/1ivnI5V3xRv8/C91uk80H01O0bUzPOjyHac1b9Fg+k0jvDpwicWfQY8KqEvyeW//CPMiINzOlhRQztGVGWDZH/EtiemiQIiylvwY9KT2ldcTKdnyOmSM855aGlqjmYGQc3GCpsC6syEGwP6YiByRr67NShhRKLxZI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=X9FEFV6z; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="X9FEFV6z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A757DC4CEC2; Wed, 2 Oct 2024 14:34:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727879688; bh=N5FEYhNDs5ES9KYrTNgYYm6nFtawYb8A1vyUm5NIxKA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X9FEFV6zTmChwCc+/CkdrfbRjO5ok6AOFRKOJg6qHSw+v8usVsgjoXRz98mIOk4bI LXrhLMkTtsG0AGVeWKlSe9iRvkSfVzpKg12blAg+Y0yuHqVWNKE5qUS9WuHDulhAcU cUhkts3/Zrp3RaCNz/dVUbsfyS3FHNllUFBWnV/w= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tony Ambardar , Andrii Nakryiko , Sasha Levin Subject: [PATCH 6.6 205/538] selftests/bpf: Fix errors compiling lwt_redirect.c with musl libc Date: Wed, 2 Oct 2024 14:57:24 +0200 Message-ID: <20241002125800.347313065@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125751.964700919@linuxfoundation.org> References: <20241002125751.964700919@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tony Ambardar [ Upstream commit 27c4797ce51c8dd51e35e68e9024a892f62d78b2 ] Remove a redundant include of '' which is already provided in 'lwt_helpers.h'. This avoids errors seen compiling for mips64el/musl-libc: In file included from .../arpa/inet.h:9, from lwt_redirect.c:51: .../netinet/in.h:23:8: error: redefinition of 'struct in6_addr' 23 | struct in6_addr { | ^~~~~~~~ In file included from .../linux/icmp.h:24, from lwt_redirect.c:50: .../linux/in6.h:33:8: note: originally defined here 33 | struct in6_addr { | ^~~~~~~~ .../netinet/in.h:34:8: error: redefinition of 'struct sockaddr_in6' 34 | struct sockaddr_in6 { | ^~~~~~~~~~~~ .../linux/in6.h:50:8: note: originally defined here 50 | struct sockaddr_in6 { | ^~~~~~~~~~~~ .../netinet/in.h:42:8: error: redefinition of 'struct ipv6_mreq' 42 | struct ipv6_mreq { | ^~~~~~~~~ .../linux/in6.h:60:8: note: originally defined here 60 | struct ipv6_mreq { | ^~~~~~~~~ Fixes: 43a7c3ef8a15 ("selftests/bpf: Add lwt_xmit tests for BPF_REDIRECT") Signed-off-by: Tony Ambardar Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/3869dda876d5206d2f8d4dd67331c739ceb0c7f8.1721713597.git.tony.ambardar@gmail.com Signed-off-by: Sasha Levin --- tools/testing/selftests/bpf/prog_tests/lwt_redirect.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/bpf/prog_tests/lwt_redirect.c b/tools/testing/selftests/bpf/prog_tests/lwt_redirect.c index 2bc932a18c17e..ea326e26656f5 100644 --- a/tools/testing/selftests/bpf/prog_tests/lwt_redirect.c +++ b/tools/testing/selftests/bpf/prog_tests/lwt_redirect.c @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #include -- 2.43.0