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

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

Merge "defconfig: sdm450: Enable missing networking options"

parents a5a8825c f693cc61

arch/arm/configs/msm8953-perf_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -102,10 +102,12 @@ CONFIG_IP_MULTIPLE_TABLES=y 
CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_SYN_COOKIES=y

CONFIG_NET_IPVTI=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

CONFIG_INET_UDP_DIAG=y

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y
@@ -122,7 +124,6 @@ CONFIG_NF_CONNTRACK=y 
CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=y

CONFIG_NF_CT_PROTO_SCTP=y

CONFIG_NF_CT_PROTO_UDPLITE=y

CONFIG_NF_CONNTRACK_AMANDA=y

CONFIG_NF_CONNTRACK_FTP=y
@@ -169,6 +170,7 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y 
CONFIG_NETFILTER_XT_MATCH_QTAGUID=y

CONFIG_NETFILTER_XT_MATCH_QUOTA=y

CONFIG_NETFILTER_XT_MATCH_QUOTA2=y

# CONFIG_NETFILTER_XT_MATCH_SCTP is not set

CONFIG_NETFILTER_XT_MATCH_SOCKET=y

CONFIG_NETFILTER_XT_MATCH_STATE=y

CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
@@ -202,6 +204,7 @@ CONFIG_IP6_NF_MANGLE=y 
CONFIG_IP6_NF_RAW=y

CONFIG_BRIDGE_NF_EBTABLES=y

CONFIG_BRIDGE_EBT_BROUTE=y

CONFIG_IP_SCTP=y

CONFIG_L2TP=y

CONFIG_L2TP_DEBUGFS=y

CONFIG_L2TP_V3=y

arch/arm/configs/msm8953_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -106,10 +106,12 @@ CONFIG_IP_MULTIPLE_TABLES=y 
CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_SYN_COOKIES=y

CONFIG_NET_IPVTI=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

CONFIG_INET_UDP_DIAG=y

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y
@@ -126,7 +128,6 @@ CONFIG_NF_CONNTRACK=y 
CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=y

CONFIG_NF_CT_PROTO_SCTP=y

CONFIG_NF_CT_PROTO_UDPLITE=y

CONFIG_NF_CONNTRACK_AMANDA=y

CONFIG_NF_CONNTRACK_FTP=y
@@ -173,6 +174,7 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y 
CONFIG_NETFILTER_XT_MATCH_QTAGUID=y

CONFIG_NETFILTER_XT_MATCH_QUOTA=y

CONFIG_NETFILTER_XT_MATCH_QUOTA2=y

# CONFIG_NETFILTER_XT_MATCH_SCTP is not set

CONFIG_NETFILTER_XT_MATCH_SOCKET=y

CONFIG_NETFILTER_XT_MATCH_STATE=y

CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
@@ -206,6 +208,7 @@ CONFIG_IP6_NF_MANGLE=y 
CONFIG_IP6_NF_RAW=y

CONFIG_BRIDGE_NF_EBTABLES=y

CONFIG_BRIDGE_EBT_BROUTE=y

CONFIG_IP_SCTP=y

CONFIG_L2TP=y

CONFIG_L2TP_DEBUGFS=y

CONFIG_L2TP_V3=y

arch/arm64/configs/msm8953-perf_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -105,10 +105,12 @@ CONFIG_IP_MULTIPLE_TABLES=y 
CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_SYN_COOKIES=y

CONFIG_NET_IPVTI=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

CONFIG_INET_UDP_DIAG=y

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y
@@ -125,7 +127,6 @@ CONFIG_NF_CONNTRACK=y 
CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=y

CONFIG_NF_CT_PROTO_SCTP=y

CONFIG_NF_CT_PROTO_UDPLITE=y

CONFIG_NF_CONNTRACK_AMANDA=y

CONFIG_NF_CONNTRACK_FTP=y
@@ -172,6 +173,7 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y 
CONFIG_NETFILTER_XT_MATCH_QTAGUID=y

CONFIG_NETFILTER_XT_MATCH_QUOTA=y

CONFIG_NETFILTER_XT_MATCH_QUOTA2=y

# CONFIG_NETFILTER_XT_MATCH_SCTP is not set

CONFIG_NETFILTER_XT_MATCH_SOCKET=y

CONFIG_NETFILTER_XT_MATCH_STATE=y

CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
@@ -205,6 +207,7 @@ CONFIG_IP6_NF_MANGLE=y 
CONFIG_IP6_NF_RAW=y

CONFIG_BRIDGE_NF_EBTABLES=y

CONFIG_BRIDGE_EBT_BROUTE=y

CONFIG_IP_SCTP=y

CONFIG_L2TP=y

CONFIG_L2TP_V3=y

CONFIG_L2TP_IP=y

arch/arm64/configs/msm8953_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -109,10 +109,12 @@ CONFIG_IP_MULTIPLE_TABLES=y 
CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_SYN_COOKIES=y

CONFIG_NET_IPVTI=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

CONFIG_INET_UDP_DIAG=y

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y
@@ -129,7 +131,6 @@ CONFIG_NF_CONNTRACK=y 
CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=y

CONFIG_NF_CT_PROTO_SCTP=y

CONFIG_NF_CT_PROTO_UDPLITE=y

CONFIG_NF_CONNTRACK_AMANDA=y

CONFIG_NF_CONNTRACK_FTP=y
@@ -176,6 +177,7 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y 
CONFIG_NETFILTER_XT_MATCH_QTAGUID=y

CONFIG_NETFILTER_XT_MATCH_QUOTA=y

CONFIG_NETFILTER_XT_MATCH_QUOTA2=y

# CONFIG_NETFILTER_XT_MATCH_SCTP is not set

CONFIG_NETFILTER_XT_MATCH_SOCKET=y

CONFIG_NETFILTER_XT_MATCH_STATE=y

CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
@@ -209,6 +211,7 @@ CONFIG_IP6_NF_MANGLE=y 
CONFIG_IP6_NF_RAW=y

CONFIG_BRIDGE_NF_EBTABLES=y

CONFIG_BRIDGE_EBT_BROUTE=y

CONFIG_IP_SCTP=y

CONFIG_L2TP=y

CONFIG_L2TP_DEBUGFS=y

CONFIG_L2TP_V3=y