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

This project is archived. Its data is read-only.

Commit 598f95ba authored Aug 01, 2016 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Aug 01, 2016

Merge "Revert "net: activity_stats: Add statistics for network transmission activity""

parents 3cfc91a2 843033e0

arch/arm64/configs/msm-perf_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -96,7 +96,6 @@ CONFIG_INET6_IPCOMP=y
		CONFIG_IPV6_MIP6=y
		CONFIG_IPV6_MULTIPLE_TABLES=y
		CONFIG_IPV6_SUBTREES=y
		# CONFIG_NET_ACTIVITY_STATS is not set
		CONFIG_NETFILTER=y
		CONFIG_NF_CONNTRACK=y
		CONFIG_NF_CONNTRACK_SECMARK=y

arch/arm64/configs/msm_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,6 @@ CONFIG_INET6_IPCOMP=y
		CONFIG_IPV6_MIP6=y
		CONFIG_IPV6_MULTIPLE_TABLES=y
		CONFIG_IPV6_SUBTREES=y
		# CONFIG_NET_ACTIVITY_STATS is not set
		CONFIG_NETFILTER=y
		CONFIG_NF_CONNTRACK=y
		CONFIG_NF_CONNTRACK_SECMARK=y

arch/arm64/configs/msmcortex-perf_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,6 @@ CONFIG_INET6_IPCOMP=y
		CONFIG_IPV6_MIP6=y
		CONFIG_IPV6_MULTIPLE_TABLES=y
		CONFIG_IPV6_SUBTREES=y
		# CONFIG_NET_ACTIVITY_STATS is not set
		CONFIG_NETFILTER=y
		CONFIG_NF_CONNTRACK=y
		CONFIG_NF_CONNTRACK_SECMARK=y

arch/arm64/configs/msmcortex_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,6 @@ CONFIG_INET6_IPCOMP=y
		CONFIG_IPV6_MIP6=y
		CONFIG_IPV6_MULTIPLE_TABLES=y
		CONFIG_IPV6_SUBTREES=y
		# CONFIG_NET_ACTIVITY_STATS is not set
		CONFIG_NETFILTER=y
		CONFIG_NF_CONNTRACK=y
		CONFIG_NF_CONNTRACK_SECMARK=y

arch/um/configs/x86_64_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@ CONFIG_UNIX=y
		CONFIG_INET=y
		# CONFIG_INET_LRO is not set
		# CONFIG_IPV6 is not set
		# CONFIG_NET_ACTIVITY_STATS is not set
		CONFIG_UML_NET=y
		CONFIG_UML_NET_ETHERTAP=y
		CONFIG_UML_NET_TUNTAP=y