diff options
| author | Ian Wisbon <ian.wisbon@timesys.com> | 2011-02-14 16:41:03 -0500 |
|---|---|---|
| committer | Ian Wisbon <ian.wisbon@timesys.com> | 2011-02-14 16:41:03 -0500 |
| commit | 8a83780a187ba1961380814eaf9c503043345d12 (patch) | |
| tree | 80f5d89cca49330e137688c72fb10c9f42dc5663 /net/socket.c | |
| parent | 14a4057959f8ee0a2249eb2abd64fd6b1f571d98 (diff) | |
Digi Release Code from del-5.6/main2.6.31-digi-201102141643
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/net/socket.c b/net/socket.c index f3cfd48191af..6d4716559047 100644 --- a/net/socket.c +++ b/net/socket.c @@ -96,10 +96,6 @@ #include <net/sock.h> #include <linux/netfilter.h> -#ifdef CONFIG_UID_STAT -#include <linux/uid_stat.h> -#endif - static int sock_no_open(struct inode *irrelevant, struct file *dontcare); static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t pos); @@ -574,12 +570,7 @@ static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock, if (err) return err; - err = sock->ops->sendmsg(iocb, sock, msg, size); -#ifdef CONFIG_UID_STAT - if (err > 0) - update_tcp_snd(current_uid(), err); -#endif - return err; + return sock->ops->sendmsg(iocb, sock, msg, size); } int sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) @@ -693,12 +684,7 @@ static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock, if (err) return err; - err = sock->ops->recvmsg(iocb, sock, msg, size, flags); -#ifdef CONFIG_UID_STAT - if (err > 0) - update_tcp_rcv(current_uid(), err); -#endif - return err; + return sock->ops->recvmsg(iocb, sock, msg, size, flags); } int sock_recvmsg(struct socket *sock, struct msghdr *msg, |