projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2a1ac25
)
macvtap: update file current position
author
Zhi Yong Wu
<wuzhy@linux.vnet.ibm.com>
Fri, 6 Dec 2013 06:16:50 +0000
(14:16 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 15 Jan 2014 23:31:32 +0000
(15:31 -0800)
[ Upstream commit
e6ebc7f16ca1434a334647aa56399c546be4e64b
]
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/macvtap.c
patch
|
blob
|
history
diff --git
a/drivers/net/macvtap.c
b/drivers/net/macvtap.c
index
dc76670
..
688d983
100644
(file)
--- a/
drivers/net/macvtap.c
+++ b/
drivers/net/macvtap.c
@@
-886,6
+886,8
@@
static ssize_t macvtap_aio_read(struct kiocb *iocb, const struct iovec *iv,
ret = macvtap_do_read(q, iocb, 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:
return ret;
}