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

Commit a19c52f0 authored Jul 02, 2015 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Jul 02, 2015

Merge "defconfig: arm64: msm: Enable support for IPv4 tethering"

parents 738fe103 c3e12f24

arch/arm64/configs/msm-perf_defconfig

+4 −0

Original line number	Diff line number	Diff line
		@@ -134,7 +134,11 @@ CONFIG_NETFILTER_XT_MATCH_TIME=y
		CONFIG_NETFILTER_XT_MATCH_U32=y
		CONFIG_NF_CONNTRACK_IPV4=y
		CONFIG_NF_NAT_IPV4=y
		CONFIG_IP_NF_NAT=y
		CONFIG_NF_NAT_MASQUERADE_IPV4=y
		CONFIG_IP_NF_IPTABLES=y
		CONFIG_NETFILTER_XT_NAT=y
		CONFIG_IP_NF_TARGET_MASQUERADE=y
		CONFIG_IP_NF_MATCH_AH=y
		CONFIG_IP_NF_MATCH_ECN=y
		CONFIG_IP_NF_MATCH_TTL=y

arch/arm64/configs/msm_defconfig

+4 −0

Original line number	Diff line number	Diff line
		@@ -134,7 +134,11 @@ CONFIG_NETFILTER_XT_MATCH_TIME=y
		CONFIG_NETFILTER_XT_MATCH_U32=y
		CONFIG_NF_CONNTRACK_IPV4=y
		CONFIG_NF_NAT_IPV4=y
		CONFIG_IP_NF_NAT=y
		CONFIG_NF_NAT_MASQUERADE_IPV4=y
		CONFIG_IP_NF_IPTABLES=y
		CONFIG_NETFILTER_XT_NAT=y
		CONFIG_IP_NF_TARGET_MASQUERADE=y
		CONFIG_IP_NF_MATCH_AH=y
		CONFIG_IP_NF_MATCH_ECN=y
		CONFIG_IP_NF_MATCH_TTL=y