From: Zhi Yong Wu Date: Fri, 6 Dec 2013 20:13:06 +0000 (+0800) Subject: tun: remove unused parameter in tun_do_read() X-Git-Tag: upstream/snapshot3+hdmi~3572^2~586 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f96eb74c84ebb09a03031f7f1e51789a928f9de0;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git tun: remove unused parameter in tun_do_read() Signed-off-by: Zhi Yong Wu Signed-off-by: David S. Miller --- diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 5ac2877..6b0b2a0 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1289,8 +1289,7 @@ done: } static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile, - struct kiocb *iocb, const struct iovec *iv, - ssize_t len, int noblock) + const struct iovec *iv, ssize_t len, int noblock) { DECLARE_WAITQUEUE(wait, current); struct sk_buff *skb; @@ -1353,7 +1352,7 @@ static ssize_t tun_chr_aio_read(struct kiocb *iocb, const struct iovec *iv, goto out; } - ret = tun_do_read(tun, tfile, iocb, iv, len, + ret = tun_do_read(tun, tfile, iv, len, file->f_flags & O_NONBLOCK); ret = min_t(ssize_t, ret, len); out: @@ -1452,7 +1451,7 @@ static int tun_recvmsg(struct kiocb *iocb, struct socket *sock, SOL_PACKET, TUN_TX_TIMESTAMP); goto out; } - ret = tun_do_read(tun, tfile, iocb, m->msg_iov, total_len, + ret = tun_do_read(tun, tfile, m->msg_iov, total_len, flags & MSG_DONTWAIT); if (ret > total_len) { m->msg_flags |= MSG_TRUNC;