From 59c8f5da3490d23357091fca9155205118e2220e Mon Sep 17 00:00:00 2001 From: Cody Schuffelen Date: Mon, 14 Jan 2019 18:37:28 -0800 Subject: [PATCH] ANDROID: cuttlefish_defconfig: Enable vsock options Bug: 121166534 Test: Ran cuttlefish with common kernel + vsock adb tunnel Signed-off-by: Cody Schuffelen Change-Id: I8168a710052c7daada306a915c56230c961accd4 --- arch/arm64/configs/cuttlefish_defconfig | 2 ++ arch/x86/configs/x86_64_cuttlefish_defconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig index 0aaf923e8c5a..ec0149bf7246 100644 --- a/arch/arm64/configs/cuttlefish_defconfig +++ b/arch/arm64/configs/cuttlefish_defconfig @@ -182,6 +182,8 @@ CONFIG_NET_CLS_BPF=y CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_U32=y CONFIG_NET_CLS_ACT=y +CONFIG_VSOCKETS=y +CONFIG_VIRTIO_VSOCKETS=y CONFIG_CFG80211=y # CONFIG_CFG80211_DEFAULT_PS is not set # CONFIG_CFG80211_CRDA_SUPPORT is not set diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig index 183dd803421e..ab7fced951fa 100644 --- a/arch/x86/configs/x86_64_cuttlefish_defconfig +++ b/arch/x86/configs/x86_64_cuttlefish_defconfig @@ -187,6 +187,8 @@ CONFIG_NET_CLS_BPF=y CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_U32=y CONFIG_NET_CLS_ACT=y +CONFIG_VSOCKETS=y +CONFIG_VIRTIO_VSOCKETS=y CONFIG_CFG80211=y CONFIG_MAC80211=y CONFIG_RFKILL=y