summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Strachan <astrachan@google.com>2019-04-19 18:18:15 -0700
committerAlistair Strachan <astrachan@google.com>2019-05-14 18:16:18 -0700
commit3f434ad40c2a636c644e5c5a90164d99ff87fadd (patch)
treec7789e7d915e43652e43f452a5d93a3c447c28ff
parent8b4d936c2d91e573383bd6ce3ca509d678e71b65 (diff)
ANDROID: cuttlefish_defconfig: L2TP/PPTP to OLAC/OPNS
Change-Id: Idafb69ff5b4ecfe73d2f5b7c46c4e9523ef37c08 Signed-off-by: Alistair Strachan <astrachan@google.com>
-rw-r--r--arch/arm64/configs/cuttlefish_defconfig6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig
index bf279adcff3b..36c343ece5aa 100644
--- a/arch/arm64/configs/cuttlefish_defconfig
+++ b/arch/arm64/configs/cuttlefish_defconfig
@@ -78,7 +78,6 @@ CONFIG_INET=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_NET_IPGRE_DEMUX=y
CONFIG_NET_IPVTI=y
CONFIG_INET_ESP=y
# CONFIG_INET_XFRM_MODE_BEET is not set
@@ -170,7 +169,6 @@ CONFIG_IP6_NF_FILTER=y
CONFIG_IP6_NF_TARGET_REJECT=y
CONFIG_IP6_NF_MANGLE=y
CONFIG_IP6_NF_RAW=y
-CONFIG_L2TP=y
CONFIG_NET_SCHED=y
CONFIG_NET_SCH_HTB=y
CONFIG_NET_CLS_U32=y
@@ -217,8 +215,8 @@ CONFIG_PPP=y
CONFIG_PPP_BSDCOMP=y
CONFIG_PPP_DEFLATE=y
CONFIG_PPP_MPPE=y
-CONFIG_PPTP=y
-CONFIG_PPPOL2TP=y
+CONFIG_PPPOLAC=y
+CONFIG_PPPOPNS=y
CONFIG_USB_USBNET=y
# CONFIG_USB_NET_AX8817X is not set
# CONFIG_USB_NET_AX88179_178A is not set