lib: checksum: Fix build with CONFIG_NET=n

[PATCH] lib: checksum: Fix build with CONFIG_NET=n

Posted by Palmer Dabbelt 1 year, 11 months ago

From: Palmer Dabbelt <palmer@rivosinc.com>

The generic ipv6 checksums are only defined with CONFIG_NET=y, so gate
the test as well.

Fixes: 6f4c45cbcb00 ("kunit: Add tests for csum_ipv6_magic and ip_fast_csum")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202401192143.jLdjbIy3-lkp@intel.com/
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
---
That Fixes tag is against a PR I just sent up to Linus [1], sorry for
missing this but it came in right when I was sending out the PR.

1: https://lore.kernel.org/linux-riscv/mhng-690cf774-fd28-4d25-be9f-69e19fb84d5c@palmer-ri-x1c9/T/#u
---
 lib/checksum_kunit.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/checksum_kunit.c b/lib/checksum_kunit.c
index af3e5ca4e170..225bb7701460 100644
--- a/lib/checksum_kunit.c
+++ b/lib/checksum_kunit.c
@@ -593,6 +593,7 @@ 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;
@@ -616,6 +617,7 @@ static void test_csum_ipv6_magic(struct kunit *test)
 		CHECK_EQ(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.43.0

Re: [PATCH] lib: checksum: Fix build with CONFIG_NET=n

Posted by Charlie Jenkins 1 year, 11 months ago

On Fri, Jan 19, 2024 at 06:56:01AM -0800, Palmer Dabbelt wrote:
> From: Palmer Dabbelt <palmer@rivosinc.com>
> 
> The generic ipv6 checksums are only defined with CONFIG_NET=y, so gate
> the test as well.

Reviewed-By: Charlie Jenkins <charlie@rivosinc.com>

> 
> Fixes: 6f4c45cbcb00 ("kunit: Add tests for csum_ipv6_magic and ip_fast_csum")
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202401192143.jLdjbIy3-lkp@intel.com/
> Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
> ---
> That Fixes tag is against a PR I just sent up to Linus [1], sorry for
> missing this but it came in right when I was sending out the PR.
> 
> 1: https://lore.kernel.org/linux-riscv/mhng-690cf774-fd28-4d25-be9f-69e19fb84d5c@palmer-ri-x1c9/T/#u
> ---
>  lib/checksum_kunit.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/lib/checksum_kunit.c b/lib/checksum_kunit.c
> index af3e5ca4e170..225bb7701460 100644
> --- a/lib/checksum_kunit.c
> +++ b/lib/checksum_kunit.c
> @@ -593,6 +593,7 @@ 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;
> @@ -616,6 +617,7 @@ static void test_csum_ipv6_magic(struct kunit *test)
>  		CHECK_EQ(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.43.0
>