Commit de2aa476 authored by David S. Miller's avatar David S. Miller
Browse files

Revert "macvtap: remove useless codes in macvtap_aio_read() and macvtap_recvmsg()" 



This reverts commit 41e4af69.

MSG_TRUNC handling was broken and is going to be fixed in the
'net' tree, so revert this.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 42404c09

drivers/net/macvtap.c

+5 −0
Original line number Diff line number Diff line
@@ -871,6 +871,7 @@ static ssize_t macvtap_aio_read(struct kiocb *iocb, const struct iovec *iv, 
	}



	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? */

	if (ret > 0)

		iocb->ki_pos = ret;

out:
@@ -1105,6 +1106,10 @@ static int macvtap_recvmsg(struct kiocb *iocb, struct socket *sock, 
		return -EINVAL;

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

			  flags & MSG_DONTWAIT);

	if (ret > total_len) {

		m->msg_flags |= MSG_TRUNC;

		ret = flags & MSG_TRUNC ? ret : total_len;

	}

	return ret;

}