aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/macvtap.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 4a34bcb6549f..2aa5e973ef17 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -871,7 +871,6 @@ static ssize_t macvtap_aio_read(struct kiocb *iocb, const struct iovec *iv,
871 } 871 }
872 872
873 ret = macvtap_do_read(q, iv, len, file->f_flags & O_NONBLOCK); 873 ret = macvtap_do_read(q, iv, len, file->f_flags & O_NONBLOCK);
874 ret = min_t(ssize_t, ret, len); /* XXX copied from tun.c. Why? */
875 if (ret > 0) 874 if (ret > 0)
876 iocb->ki_pos = ret; 875 iocb->ki_pos = ret;
877out: 876out:
@@ -1106,10 +1105,6 @@ static int macvtap_recvmsg(struct kiocb *iocb, struct socket *sock,
1106 return -EINVAL; 1105 return -EINVAL;
1107 ret = macvtap_do_read(q, m->msg_iov, total_len, 1106 ret = macvtap_do_read(q, m->msg_iov, total_len,
1108 flags & MSG_DONTWAIT); 1107 flags & MSG_DONTWAIT);
1109 if (ret > total_len) {
1110 m->msg_flags |= MSG_TRUNC;
1111 ret = flags & MSG_TRUNC ? ret : total_len;
1112 }
1113 return ret; 1108 return ret;
1114} 1109}
1115 1110