diff options
| author | Cody Schuffelen <schuffelen@google.com> | 2019-01-14 18:37:28 -0800 |
|---|---|---|
| committer | Alistair Strachan <astrachan@google.com> | 2019-01-22 17:21:32 +0000 |
| commit | ea0c4ffbceb336259e2ecb94b81212da21d1aab3 (patch) | |
| tree | dc9a9cae452ed5d75c7135d14fa9d0f6e67cde10 | |
| parent | 4b1d0d3e4e008caa05e485a31305f64e428015c1 (diff) | |
ANDROID: cuttlefish_defconfig: Enable vsock options
Bug: 121166534
Test: Ran cuttlefish with common kernel + vsock adb tunnel
Signed-off-by: Cody Schuffelen <schuffelen@google.com>
Change-Id: I8168a710052c7daada306a915c56230c961accd4
| -rw-r--r-- | arch/arm64/configs/cuttlefish_defconfig | 2 | ||||
| -rw-r--r-- | arch/x86/configs/x86_64_cuttlefish_defconfig | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig index 1ff6114ac682..62497b562a26 100644 --- a/arch/arm64/configs/cuttlefish_defconfig +++ b/arch/arm64/configs/cuttlefish_defconfig @@ -183,6 +183,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_MAC80211=y diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig index bc1fd7f32992..181c644734b2 100644 --- a/arch/x86/configs/x86_64_cuttlefish_defconfig +++ b/arch/x86/configs/x86_64_cuttlefish_defconfig @@ -196,6 +196,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 |