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

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

Merge "defconfig: msm8937: Enable missing networking options"

parents 28a7a292 a5d9d00a

arch/arm/configs/msm8937-perf_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -107,10 +107,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
@@ -127,7 +129,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
@@ -174,6 +175,7 @@ CONFIG_NETFILTER_XT_MATCH_POLICY=y 
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=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
@@ -207,6 +209,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/msm8937_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -110,10 +110,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
@@ -130,7 +132,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
@@ -177,6 +178,7 @@ CONFIG_NETFILTER_XT_MATCH_POLICY=y 
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=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
@@ -210,6 +212,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/msm8937-perf_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ CONFIG_IP_ROUTE_VERBOSE=y 
CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_NET_IPGRE_DEMUX=y

CONFIG_SYN_COOKIES=y

CONFIG_NET_IPVTI=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y
@@ -128,7 +129,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
@@ -175,6 +175,7 @@ CONFIG_NETFILTER_XT_MATCH_POLICY=y 
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=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
@@ -208,6 +209,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/msm8937_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ CONFIG_IP_ROUTE_VERBOSE=y 
CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_NET_IPGRE_DEMUX=y

CONFIG_SYN_COOKIES=y

CONFIG_NET_IPVTI=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y
@@ -132,7 +133,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
@@ -179,6 +179,7 @@ CONFIG_NETFILTER_XT_MATCH_POLICY=y 
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=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
@@ -212,6 +213,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