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

This reverts commit afedd7beba14385fd797166751fde39e0f52cf72.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

diff --git a/drivers/misc/uid_stat.c b/drivers/misc/uid_stat.c
index 2141124a6c1291e2ace75a465c5c3b803364531c..e6760b56083c4d64ac762358dc7040dd6cdb7cd0 100644 (file)
--- a/drivers/misc/uid_stat.c
+++ b/drivers/misc/uid_stat.c
@@ -24,7 +24,6 @@
 #include <linux/spinlock.h>
 #include <linux/stat.h>
 #include <linux/uid_stat.h>
-#include <net/activity_stats.h>
 
 static DEFINE_SPINLOCK(uid_lock);
 static LIST_HEAD(uid_list);
@@ -123,7 +122,6 @@ static struct uid_stat *create_stat(uid_t uid) {
 
 int uid_stat_tcp_snd(uid_t uid, int size) {
        struct uid_stat *entry;
-       activity_stats_update();
        if ((entry = find_uid_stat(uid)) == NULL &&
                ((entry = create_stat(uid)) == NULL)) {
                        return -1;
@@ -134,7 +132,6 @@ int uid_stat_tcp_snd(uid_t uid, int size) {
 
 int uid_stat_tcp_rcv(uid_t uid, int size) {
        struct uid_stat *entry;
-       activity_stats_update();
        if ((entry = find_uid_stat(uid)) == NULL &&
                ((entry = create_stat(uid)) == NULL)) {
                        return -1;

diff --git a/include/net/activity_stats.h b/include/net/activity_stats.h
deleted file mode 100644 (file)
index 10e4c15..0000000
--- a/include/net/activity_stats.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2010 Google, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Author: Mike Chan (mike@android.com)
- */
-
-#ifndef __activity_stats_h
-#define __activity_stats_h
-
-#ifdef CONFIG_NET_ACTIVITY_STATS
-void activity_stats_update(void);
-#else
-#define activity_stats_update(void) {}
-#endif
-
-#endif /* _NET_ACTIVITY_STATS_H */

diff --git a/net/Kconfig b/net/Kconfig
index 043fe1dc08607508008a0ef416101fb6db0e526b..ce9585cf343a7a3848c851c9d62ca2b7f8c39708 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -92,14 +92,6 @@ config ANDROID_PARANOID_NETWORK
        help
                none
 
-config NET_ACTIVITY_STATS
-       bool "Network activity statistics tracking"
-       default y
-       help
-        Network activity statistics are useful for tracking wireless
-        modem activity on 2G, 3G, 4G wireless networks. Counts number of
-        transmissions and groups them in specified time buckets.
-
 config NETWORK_SECMARK
        bool "Security Marking"
        help

diff --git a/net/Makefile b/net/Makefile
index eeb9d5db454f84855e4cfca40ca58c09c722de53..a5d04098dfce8693c46785f6c0dfa90bd23f4187 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -77,4 +77,3 @@ endif
 ifneq ($(CONFIG_NET_L3_MASTER_DEV),)
 obj-y                          += l3mdev/
 endif
-obj-$(CONFIG_NET_ACTIVITY_STATS)               += activity_stats.o

diff --git a/net/activity_stats.c b/net/activity_stats.c
deleted file mode 100644 (file)
index 8a3e934..0000000
--- a/net/activity_stats.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* net/activity_stats.c
- *
- * Copyright (C) 2010 Google, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Author: Mike Chan (mike@android.com)
- */
-
-#include <linux/proc_fs.h>
-#include <linux/suspend.h>
-#include <net/net_namespace.h>
-
-/*
- * Track transmission rates in buckets (power of 2).
- * 1,2,4,8...512 seconds.
- *
- * Buckets represent the count of network transmissions at least
- * N seconds apart, where N is 1 << bucket index.
- */
-#define BUCKET_MAX 10
-
-/* Track network activity frequency */
-static unsigned long activity_stats[BUCKET_MAX];
-static ktime_t last_transmit;
-static ktime_t suspend_time;
-static DEFINE_SPINLOCK(activity_lock);
-
-void activity_stats_update(void)
-{
-       int i;
-       unsigned long flags;
-       ktime_t now;
-       s64 delta;
-
-       spin_lock_irqsave(&activity_lock, flags);
-       now = ktime_get();
-       delta = ktime_to_ns(ktime_sub(now, last_transmit));
-
-       for (i = BUCKET_MAX - 1; i >= 0; i--) {
-               /*
-                * Check if the time delta between network activity is within the
-                * minimum bucket range.
-                */
-               if (delta < (1000000000ULL << i))
-                       continue;
-
-               activity_stats[i]++;
-               last_transmit = now;
-               break;
-       }
-       spin_unlock_irqrestore(&activity_lock, flags);
-}
-
-static int activity_stats_read_proc(char *page, char **start, off_t off,
-                                       int count, int *eof, void *data)
-{
-       int i;
-       int len;
-       char *p = page;
-
-       /* Only print if offset is 0, or we have enough buffer space */
-       if (off || count < (30 * BUCKET_MAX + 22))
-               return -ENOMEM;
-
-       len = snprintf(p, count, "Min Bucket(sec) Count\n");
-       count -= len;
-       p += len;
-
-       for (i = 0; i < BUCKET_MAX; i++) {
-               len = snprintf(p, count, "%15d %lu\n", 1 << i, activity_stats[i]);
-               count -= len;
-               p += len;
-       }
-       *eof = 1;
-
-       return p - page;
-}
-
-static int activity_stats_notifier(struct notifier_block *nb,
-                                       unsigned long event, void *dummy)
-{
-       switch (event) {
-               case PM_SUSPEND_PREPARE:
-                       suspend_time = ktime_get_real();
-                       break;
-
-               case PM_POST_SUSPEND:
-                       suspend_time = ktime_sub(ktime_get_real(), suspend_time);
-                       last_transmit = ktime_sub(last_transmit, suspend_time);
-       }
-
-       return 0;
-}
-
-static struct notifier_block activity_stats_notifier_block = {
-       .notifier_call = activity_stats_notifier,
-};
-
-static int  __init activity_stats_init(void)
-{
-       create_proc_read_entry("activity", S_IRUGO,
-                       init_net.proc_net_stat, activity_stats_read_proc, NULL);
-       return register_pm_notifier(&activity_stats_notifier_block);
-}
-
-subsys_initcall(activity_stats_init);
-