]> Pileus Git - ~andy/linux/commitdiff
macvtap: remove unused parameter in macvtap_do_read()
authorZhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Fri, 6 Dec 2013 20:13:05 +0000 (04:13 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 6 Dec 2013 20:22:05 +0000 (15:22 -0500)
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/macvtap.c

index f599c47524f4eaed952af6cb4e951d05a38f2e00..4c6f84c79e9564b83cf0fc49583a1b678017ab83 100644 (file)
@@ -819,7 +819,7 @@ done:
        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;