Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95f3e1c3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: Enable configs for 8996 VPN support"

parents b49bfdce e4415d74

arch/arm64/configs/msm-perf_defconfig

+14 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y
@@ -74,6 +75,7 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_IPV6=y
@@ -122,6 +124,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=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
@@ -160,6 +163,11 @@ CONFIG_IP6_NF_MANGLE=y 
CONFIG_IP6_NF_RAW=y

CONFIG_BRIDGE_NF_EBTABLES=y

CONFIG_BRIDGE_EBT_BROUTE=y

CONFIG_L2TP=y

CONFIG_L2TP_DEBUGFS=y

CONFIG_L2TP_V3=y

CONFIG_L2TP_IP=y

CONFIG_L2TP_ETH=y

CONFIG_BRIDGE=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_HTB=y
@@ -230,7 +238,13 @@ CONFIG_RNDIS_IPA=y 
CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y

CONFIG_PPP_DEFLATE=y

CONFIG_PPP_FILTER=y

CONFIG_PPP_MPPE=y

CONFIG_PPP_MULTILINK=y

CONFIG_PPPOE=y

CONFIG_PPPOL2TP=y

CONFIG_PPPOLAC=y

CONFIG_PPPOPNS=y

CONFIG_PPP_ASYNC=y

CONFIG_PPP_SYNC_TTY=y

CONFIG_USB_USBNET=y

arch/arm64/configs/msm_defconfig

+14 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y
@@ -73,6 +74,7 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_IPV6=y
@@ -121,6 +123,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=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
@@ -159,6 +162,11 @@ CONFIG_IP6_NF_MANGLE=y 
CONFIG_IP6_NF_RAW=y

CONFIG_BRIDGE_NF_EBTABLES=y

CONFIG_BRIDGE_EBT_BROUTE=y

CONFIG_L2TP=y

CONFIG_L2TP_DEBUGFS=y

CONFIG_L2TP_V3=y

CONFIG_L2TP_IP=y

CONFIG_L2TP_ETH=y

CONFIG_BRIDGE=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_HTB=y
@@ -229,7 +237,13 @@ CONFIG_RNDIS_IPA=y 
CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y

CONFIG_PPP_DEFLATE=y

CONFIG_PPP_FILTER=y

CONFIG_PPP_MPPE=y

CONFIG_PPP_MULTILINK=y

CONFIG_PPPOE=y

CONFIG_PPPOL2TP=y

CONFIG_PPPOLAC=y

CONFIG_PPPOPNS=y

CONFIG_PPP_ASYNC=y

CONFIG_PPP_SYNC_TTY=y

CONFIG_USB_USBNET=y