Skip to contentSkip to conversation

lib: checksum: hide unused expected_csum_ipv6_magic[]

PATCH Applied Arnd Bergmann 3 participants 3 messages Apr 4, 2024 – Apr 8, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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")

---
resending v2 to netdev

 lib/checksum_kunit.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
lib/checksum_kunit.c +3 -2
index bf70850035c7..404dba36bae3 100644
@@ -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[] = {
Signature · 1 line
2.39.2
reviewer Reviewed-by Tested-by on v2 1/1
#1 lore raw
Quoted 10 lines · Arnd Bergmann

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.

Quoted 7 lines
Fixes f24a70106dc1 ("lib: checksum: Fix build with CONFIG_NET=n")

---
resending v2 to netdev

#2 lore raw
In reply to Arnd Bergmann
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:

Hello:

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

Quoted 8 lines · 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!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html