diff options
author | Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> | 2013-12-06 15:13:05 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-12-06 15:22:05 -0500 |
commit | 55ec8e25cd9752060c80f926707d0187ea918d73 (patch) | |
tree | 6e40457f01f0a56d1f50269febdf5d65dfe30e47 /drivers/net/macvtap.c | |
parent | 359d44d764f5e2a8e5bd9aee66f89f240ad7b622 (diff) |
macvtap: remove unused parameter in macvtap_do_read()
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macvtap.c')
-rw-r--r-- | drivers/net/macvtap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index f599c47524f4..4c6f84c79e95 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c | |||
@@ -819,7 +819,7 @@ done: | |||
819 | return ret ? ret : copied; | 819 | return ret ? ret : copied; |
820 | } | 820 | } |
821 | 821 | ||
822 | static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb, | 822 | static ssize_t macvtap_do_read(struct macvtap_queue *q, |
823 | const struct iovec *iv, unsigned long len, | 823 | const struct iovec *iv, unsigned long len, |
824 | int noblock) | 824 | int noblock) |
825 | { | 825 | { |
@@ -870,7 +870,7 @@ static ssize_t macvtap_aio_read(struct kiocb *iocb, const struct iovec *iv, | |||
870 | goto out; | 870 | goto out; |
871 | } | 871 | } |
872 | 872 | ||
873 | ret = macvtap_do_read(q, iocb, 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? */ | 874 | ret = min_t(ssize_t, ret, len); /* XXX copied from tun.c. Why? */ |
875 | out: | 875 | out: |
876 | return ret; | 876 | return ret; |
@@ -1102,7 +1102,7 @@ static int macvtap_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
1102 | int ret; | 1102 | int ret; |
1103 | if (flags & ~(MSG_DONTWAIT|MSG_TRUNC)) | 1103 | if (flags & ~(MSG_DONTWAIT|MSG_TRUNC)) |
1104 | return -EINVAL; | 1104 | return -EINVAL; |
1105 | ret = macvtap_do_read(q, iocb, m->msg_iov, total_len, | 1105 | ret = macvtap_do_read(q, m->msg_iov, total_len, |
1106 | flags & MSG_DONTWAIT); | 1106 | flags & MSG_DONTWAIT); |
1107 | if (ret > total_len) { | 1107 | if (ret > total_len) { |
1108 | m->msg_flags |= MSG_TRUNC; | 1108 | m->msg_flags |= MSG_TRUNC; |