Revert "misc: uidstat: Adding uid stat driver to collect network statistics."

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / tcp.c

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index cf2e13db0619e19ac9f4d2202b92cd153a9109e5..6ecfc9de599ccede1db44d92e51f4304b34cd09c 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -269,7 +269,6 @@
 #include <linux/crypto.h>
 #include <linux/time.h>
 #include <linux/slab.h>
-#include <linux/uid_stat.h>
 
 #include <net/icmp.h>
 #include <net/inet_common.h>
@@ -1285,10 +1284,6 @@ out:
                tcp_push(sk, flags, mss_now, tp->nonagle, size_goal);
 out_nopush:
        release_sock(sk);
-
-       if (copied + copied_syn)
-               uid_stat_tcp_snd(from_kuid(&init_user_ns, current_uid()),
-                                copied + copied_syn);
        return copied + copied_syn;
 
 do_fault:
@@ -1563,8 +1558,6 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,
        if (copied > 0) {
                tcp_recv_skb(sk, seq, &offset);
                tcp_cleanup_rbuf(sk, copied);
-               uid_stat_tcp_rcv(from_kuid(&init_user_ns, current_uid()),
-                                copied);
        }
        return copied;
 }
@@ -1898,10 +1891,6 @@ skip_copy:
        tcp_cleanup_rbuf(sk, copied);
 
        release_sock(sk);
-
-       if (copied > 0)
-               uid_stat_tcp_rcv(from_kuid(&init_user_ns, current_uid()),
-                                copied);
        return copied;
 
 out:
@@ -1910,9 +1899,6 @@ out:
 
 recv_urg:
        err = tcp_recv_urg(sk, msg, len, flags);
-       if (err > 0)
-               uid_stat_tcp_rcv(from_kuid(&init_user_ns, current_uid()),
-                                err);
        goto out;
 
 recv_sndq: