diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-01 21:56:42 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-01 21:56:41 -0700 |
| commit | 1e86ba99e526d9dd6b830954e89b1246c374c424 (patch) | |
| tree | bc156bb9f93d35417413e39cdc5bac9a0a78f2a1 /net | |
| parent | b8977f509137dc204b14c1b8952255b77b7de942 (diff) | |
| parent | 9e776febf89ffd9c80fba99bd952ade94a0c3713 (diff) | |
Merge "Revert "misc: uidstat: Adding uid stat driver to collect network statistics.""
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index e5cdafcc2140..2ee7b830a35e 100644 --- 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> @@ -1294,10 +1293,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: @@ -1575,8 +1570,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; } @@ -1910,10 +1903,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: @@ -1922,9 +1911,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: |