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

Commit 9978f9d2 authored Sep 14, 2018 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Sep 14, 2018

Merge "defconfig: msm8909: Enable VTI config for v4 and v6"

parents 2cd69286 a8a9fc4e

arch/arm/configs/msm8909-perf_defconfig

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -77,6 +77,7 @@ CONFIG_IP_MULTIPLE_TABLES=y
	CONFIG_IP_ROUTE_VERBOSE=y		CONFIG_IP_ROUTE_VERBOSE=y
	CONFIG_IP_PNP=y		CONFIG_IP_PNP=y
	CONFIG_IP_PNP_DHCP=y		CONFIG_IP_PNP_DHCP=y
			CONFIG_NET_IPVTI=y
	CONFIG_INET_AH=y		CONFIG_INET_AH=y
	CONFIG_INET_ESP=y		CONFIG_INET_ESP=y
	# CONFIG_INET_XFRM_MODE_BEET is not set		# CONFIG_INET_XFRM_MODE_BEET is not set
	@@ -90,6 +91,7 @@ CONFIG_INET6_AH=y
	CONFIG_INET6_ESP=y		CONFIG_INET6_ESP=y
	CONFIG_INET6_IPCOMP=y		CONFIG_INET6_IPCOMP=y
	CONFIG_IPV6_MIP6=y		CONFIG_IPV6_MIP6=y
			CONFIG_IPV6_VTI=y
	CONFIG_IPV6_MULTIPLE_TABLES=y		CONFIG_IPV6_MULTIPLE_TABLES=y
	CONFIG_IPV6_SUBTREES=y		CONFIG_IPV6_SUBTREES=y
	CONFIG_NETFILTER=y		CONFIG_NETFILTER=y

arch/arm/configs/msm8909_defconfig

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -81,6 +81,7 @@ CONFIG_IP_MULTIPLE_TABLES=y
	CONFIG_IP_ROUTE_VERBOSE=y		CONFIG_IP_ROUTE_VERBOSE=y
	CONFIG_IP_PNP=y		CONFIG_IP_PNP=y
	CONFIG_IP_PNP_DHCP=y		CONFIG_IP_PNP_DHCP=y
			CONFIG_NET_IPVTI=y
	CONFIG_INET_AH=y		CONFIG_INET_AH=y
	CONFIG_INET_ESP=y		CONFIG_INET_ESP=y
	# CONFIG_INET_XFRM_MODE_BEET is not set		# CONFIG_INET_XFRM_MODE_BEET is not set
	@@ -94,6 +95,7 @@ CONFIG_INET6_AH=y
	CONFIG_INET6_ESP=y		CONFIG_INET6_ESP=y
	CONFIG_INET6_IPCOMP=y		CONFIG_INET6_IPCOMP=y
	CONFIG_IPV6_MIP6=y		CONFIG_IPV6_MIP6=y
			CONFIG_IPV6_VTI=y
	CONFIG_IPV6_MULTIPLE_TABLES=y		CONFIG_IPV6_MULTIPLE_TABLES=y
	CONFIG_IPV6_SUBTREES=y		CONFIG_IPV6_SUBTREES=y
	CONFIG_NETFILTER=y		CONFIG_NETFILTER=y