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

Commit a520a93c 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 network options"

parents e2bbd349 57ba45f0

arch/arm/configs/msm8937-perf_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -99,12 +99,14 @@ 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_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_INET_UDP_DIAG=y

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IPV6=y

CONFIG_IPV6_ROUTER_PREF=y
@@ -123,7 +125,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
@@ -203,6 +205,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
@@ -100,12 +100,14 @@ 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_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_INET_UDP_DIAG=y

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IPV6=y

CONFIG_IPV6_ROUTER_PREF=y
@@ -124,7 +126,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
@@ -170,6 +171,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
@@ -204,6 +206,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

+4 −1
Original line number Diff line number Diff line
@@ -96,12 +96,14 @@ 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_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_INET_UDP_DIAG=y

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IPV6=y

CONFIG_IPV6_ROUTER_PREF=y
@@ -119,7 +121,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
@@ -164,6 +165,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
@@ -198,6 +200,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_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -95,12 +95,14 @@ 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_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_INET_UDP_DIAG=y

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IPV6=y

CONFIG_IPV6_ROUTER_PREF=y
@@ -118,7 +120,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
@@ -163,6 +164,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
@@ -197,6 +199,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