2024-04-04 16:37:53

by Arnd Bergmann

Subject: [PATCH v2] lib: checksum: hide unused expected_csum_ipv6_magic[]

From: Arnd Bergmann <[email protected]>

When CONFIG_NET is disabled, an extra warning shows up for this
unused variable:

lib/checksum_kunit.c:218:18: error: 'expected_csum_ipv6_magic' defined but not used [-Werror=unused-const-variable=]

Replace the #ifdef with an IS_ENABLED() check that makes the compiler's
dead-code-elimination take care of the link failure.

Fixes: f24a70106dc1 ("lib: checksum: Fix build with CONFIG_NET=n")
Suggested-by: Christophe Leroy <[email protected]>
Acked-by: Palmer Dabbelt <[email protected]>
Acked-by: Jakub Kicinski <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>
---
resending v2 to netdev

lib/checksum_kunit.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/checksum_kunit.c b/lib/checksum_kunit.c
index bf70850035c7..404dba36bae3 100644
--- a/lib/checksum_kunit.c
+++ b/lib/checksum_kunit.c
@@ -594,13 +594,15 @@ static void test_ip_fast_csum(struct kunit *test)

static void test_csum_ipv6_magic(struct kunit *test)
{
-#if defined(CONFIG_NET)
const struct in6_addr *saddr;
const struct in6_addr *daddr;
unsigned int len;
unsigned char proto;
__wsum csum;

+ if (!IS_ENABLED(CONFIG_NET))
+ return;
+
const int daddr_offset = sizeof(struct in6_addr);
const int len_offset = sizeof(struct in6_addr) + sizeof(struct in6_addr);
const int proto_offset = sizeof(struct in6_addr) + sizeof(struct in6_addr) +
@@ -618,7 +620,6 @@ static void test_csum_ipv6_magic(struct kunit *test)
CHECK_EQ(to_sum16(expected_csum_ipv6_magic[i]),
csum_ipv6_magic(saddr, daddr, len, proto, csum));
}
-#endif /* !CONFIG_NET */
}

static struct kunit_case __refdata checksum_test_cases[] = {
--
2.39.2

2024-04-08 07:54:40

by Simon Horman

Subject: Re: [PATCH v2] lib: checksum: hide unused expected_csum_ipv6_magic[]

On Thu, Apr 04, 2024 at 06:36:45PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> When CONFIG_NET is disabled, an extra warning shows up for this
> unused variable:
>
> lib/checksum_kunit.c:218:18: error: 'expected_csum_ipv6_magic' defined but not used [-Werror=unused-const-variable=]
>
> Replace the #ifdef with an IS_ENABLED() check that makes the compiler's
> dead-code-elimination take care of the link failure.
>
> Fixes: f24a70106dc1 ("lib: checksum: Fix build with CONFIG_NET=n")
> Suggested-by: Christophe Leroy <[email protected]>
> Acked-by: Palmer Dabbelt <[email protected]>
> Acked-by: Jakub Kicinski <[email protected]>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> resending v2 to netdev

Reviewed-by: Simon Horman <[email protected]>
Tested-by: Simon Horman <[email protected]> # build-tested

2024-04-08 10:10:37

by patchwork-bot+netdevbpf

Subject: Re: [PATCH v2] lib: checksum: hide unused expected_csum_ipv6_magic[]

Hello:

This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:

On Thu, 4 Apr 2024 18:36:45 +0200 you wrote:
> From: Arnd Bergmann <[email protected]>
>
> When CONFIG_NET is disabled, an extra warning shows up for this
> unused variable:
>
> lib/checksum_kunit.c:218:18: error: 'expected_csum_ipv6_magic' defined but not used [-Werror=unused-const-variable=]
>
> [...]

Here is the summary with links:
- [v2] lib: checksum: hide unused expected_csum_ipv6_magic[]
https://git.kernel.org/netdev/net/c/e9d47b7b3156

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html