commit a5d10f0defc377d43672b304e31e37a517fbf0bf
author Greg Kroah-Hartman <gregkh@google.com> Mon Mar 30 09:43:24 2020 +0200
committer Greg Kroah-Hartman <gregkh@google.com> Tue Oct 13 16:57:50 2020 +0200
tree a102f3f734ae36331a0e0acaefb68bff247d398f
parent ba255a544695ae6a786c5819240b1736c216f4f0

ANDROID: GKI: enable CONFIG_WIREGUARD

Add native kernel support for a sane VPN

Note, this disables CONFIG_ARM64_CRYPTO from the gki arm64 defconfig
because CONFIG_WIREGUARD explicitly enables.  So the functionality is
still there, but the defconfig does not need to show it anymore.

Bug: 152722841
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4cb674d299778c7c994f3220292ec1c43f80e6bf

arch/arm64/configs/gki_defconfig

diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index fca5841..9f1f4c6 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -84,7 +84,6 @@
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
 CONFIG_VHOST_VSOCK=y
-CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_SHA2_ARM64_CE=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_KPROBES=y
@@ -268,6 +267,7 @@
 CONFIG_DM_BOW=y
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=y
+CONFIG_WIREGUARD=y
 CONFIG_TUN=y
 CONFIG_VETH=y
 # CONFIG_ETHERNET is not set

arch/x86/configs/gki_defconfig

diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 94b2bd35..f221d39 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -238,6 +238,7 @@
 CONFIG_DM_BOW=y
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=y
+CONFIG_WIREGUARD=y
 CONFIG_TUN=y
 CONFIG_VETH=y
 # CONFIG_ETHERNET is not set