Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73713357 authored by Zhi Yong Wu's avatar Zhi Yong Wu Committed by David S. Miller
Browse files

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: default avatarZhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 41e4af69

drivers/net/tun.c

+0 −5
Original line number Diff line number Diff line
@@ -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;