diff options
| author | Alistair Strachan <astrachan@google.com> | 2019-04-19 15:36:33 -0700 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2019-09-16 13:09:02 +0530 |
| commit | 3223a96b224905f0cbb7d2ebcae23784f8bc11fa (patch) | |
| tree | 7b69df58703be36f9ead0bc5c0e40c322aa5768a /arch | |
| parent | 2fdc85a52656f078e8f44b132ba68d254ffe8f31 (diff) | |
ANDROID: cuttlefish_defconfig: Enable L2TP/PPTP
Bug: 120439617
Bug: 130907753
Change-Id: Idac940561eb454ffaba4560e17c167409395c2a3
Signed-off-by: Alistair Strachan <astrachan@google.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/configs/x86_64_cuttlefish_defconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig index 2aa4261cb7d0..3b32bc666c02 100644 --- a/arch/x86/configs/x86_64_cuttlefish_defconfig +++ b/arch/x86/configs/x86_64_cuttlefish_defconfig @@ -90,6 +90,7 @@ CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_NET_IPGRE_DEMUX=y CONFIG_IP_MROUTE=y CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y @@ -147,6 +148,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y CONFIG_NETFILTER_XT_MATCH_HELPER=y CONFIG_NETFILTER_XT_MATCH_IPRANGE=y +# CONFIG_NETFILTER_XT_MATCH_L2TP is not set CONFIG_NETFILTER_XT_MATCH_LENGTH=y CONFIG_NETFILTER_XT_MATCH_LIMIT=y CONFIG_NETFILTER_XT_MATCH_MAC=y @@ -185,6 +187,7 @@ 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_SCH_NETEM=y @@ -241,6 +244,8 @@ CONFIG_PPP=y CONFIG_PPP_BSDCOMP=y CONFIG_PPP_DEFLATE=y CONFIG_PPP_MPPE=y +CONFIG_PPTP=y +CONFIG_PPPOL2TP=y CONFIG_USB_RTL8152=y CONFIG_USB_USBNET=y # CONFIG_USB_NET_AX8817X is not set |