diff options
| author | Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> | 2013-12-07 04:55:00 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-09 20:36:08 -0500 |
| commit | 73713357ab58aacda1af715bb5a623528dbbfd79 (patch) | |
| tree | ba37794f8a222cfac4c9ee469bf7beb0d7409f4a /drivers/net/tun.c | |
| parent | 41e4af69a5984a3193ba3108fb4e067b0e34dc73 (diff) | |
| download | linux-73713357ab58aacda1af715bb5a623528dbbfd79.tar.bz2 | |
tun: remove useless codes in tun_chr_aio_read() and tun_recvmsg()
By checking related codes, it is impossible that ret > len or total_len,
so we should remove some useless codes in both above functions.
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 3c5a8d8cde50..bbb693512918 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1354,7 +1354,6 @@ static ssize_t tun_chr_aio_read(struct kiocb *iocb, const struct iovec *iv, ret = tun_do_read(tun, tfile, iv, len, file->f_flags & O_NONBLOCK); - ret = min_t(ssize_t, ret, len); if (ret > 0) iocb->ki_pos = ret; out: @@ -1455,10 +1454,6 @@ static int tun_recvmsg(struct kiocb *iocb, struct socket *sock, } ret = tun_do_read(tun, tfile, m->msg_iov, total_len, flags & MSG_DONTWAIT); - if (ret > total_len) { - m->msg_flags |= MSG_TRUNC; - ret = flags & MSG_TRUNC ? ret : total_len; - } out: tun_put(tun); return ret; |