mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
196f3d586f
5.4.102 backported a lot of stuff that our WireGuard backport already did, in addition to other patches we had, so those patches were removed from that part of the series. In the process other patches were refreshed or reworked to account for upstream changes. This commit involved `update_kernel.sh -v -u 5.4`. Cc: John Audia <graysky@archlinux.us> Cc: David Bauer <mail@david-bauer.net> Cc: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
|
Date: Sun, 15 Dec 2019 22:08:01 +0100
|
|
Subject: [PATCH] wireguard: Kconfig: select parent dependency for crypto
|
|
|
|
commit d7c68a38bb4f9b7c1a2e4a772872c752ee5c44a6 upstream.
|
|
|
|
This fixes the crypto selection submenu depenencies. Otherwise, we'd
|
|
wind up issuing warnings in which certain dependencies we also select
|
|
couldn't be satisfied. This condition was triggered by the addition of
|
|
the test suite autobuilder in the previous commit.
|
|
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
---
|
|
drivers/net/Kconfig | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
--- a/drivers/net/Kconfig
|
|
+++ b/drivers/net/Kconfig
|
|
@@ -85,6 +85,8 @@ config WIREGUARD
|
|
select CRYPTO_POLY1305_X86_64 if X86 && 64BIT
|
|
select CRYPTO_BLAKE2S_X86 if X86 && 64BIT
|
|
select CRYPTO_CURVE25519_X86 if X86 && 64BIT
|
|
+ select ARM_CRYPTO if ARM
|
|
+ select ARM64_CRYPTO if ARM64
|
|
select CRYPTO_CHACHA20_NEON if (ARM || ARM64) && KERNEL_MODE_NEON
|
|
select CRYPTO_POLY1305_NEON if ARM64 && KERNEL_MODE_NEON
|
|
select CRYPTO_POLY1305_ARM if ARM
|