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

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

macvtap: remove unused parameter in macvtap_do_read() 



Signed-off-by: default avatarZhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 359d44d7

drivers/net/macvtap.c

+3 −3
Original line number Diff line number Diff line
@@ -819,7 +819,7 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q, 
	return ret ? ret : copied;

}



static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,

static ssize_t macvtap_do_read(struct macvtap_queue *q,

			       const struct iovec *iv, unsigned long len,

			       int noblock)

{
@@ -870,7 +870,7 @@ static ssize_t macvtap_aio_read(struct kiocb *iocb, const struct iovec *iv, 
		goto out;

	}



	ret = macvtap_do_read(q, iocb, iv, len, file->f_flags & O_NONBLOCK);

	ret = macvtap_do_read(q, iv, len, file->f_flags & O_NONBLOCK);

	ret = min_t(ssize_t, ret, len); /* XXX copied from tun.c. Why? */

out:

	return ret;
@@ -1102,7 +1102,7 @@ static int macvtap_recvmsg(struct kiocb *iocb, struct socket *sock, 
	int ret;

	if (flags & ~(MSG_DONTWAIT|MSG_TRUNC))

		return -EINVAL;

	ret = macvtap_do_read(q, iocb, m->msg_iov, total_len,

	ret = macvtap_do_read(q, m->msg_iov, total_len,

			  flags & MSG_DONTWAIT);

	if (ret > total_len) {

		m->msg_flags |= MSG_TRUNC;