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

Commit 3e75de6f authored Apr 06, 2017 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Apr 06, 2017

Merge "Arm: defconfig: config for L2L conntrack entry"

parents 8bcb6632 10319ca5

arch/arm/configs/mdm-perf_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
		CONFIG_IPV6_PIMSM_V2=y
		CONFIG_NETFILTER=y
		CONFIG_NETFILTER_DEBUG=y
		CONFIG_BRIDGE_NETFILTER=y
		CONFIG_NF_CONNTRACK=y
		CONFIG_NF_CONNTRACK_EVENTS=y
		CONFIG_NF_CONNTRACK_TIMEOUT=y

arch/arm/configs/mdm_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
		CONFIG_IPV6_PIMSM_V2=y
		CONFIG_NETFILTER=y
		CONFIG_NETFILTER_DEBUG=y
		CONFIG_BRIDGE_NETFILTER=y
		CONFIG_NF_CONNTRACK=y
		CONFIG_NF_CONNTRACK_EVENTS=y
		CONFIG_NF_CONNTRACK_TIMEOUT=y