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

Commit cab83ca3 authored Apr 05, 2017 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Apr 05, 2017

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

parents 6cf41ef3 deb805bc

arch/arm/configs/sdx-perf_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,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/sdx_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,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