* [PATCH 1/2] macvtap: update file current position
@ 2013-12-06 6:16 Zhi Yong Wu
2013-12-06 6:16 ` [PATCH 2/2] tun: " Zhi Yong Wu
0 siblings, 1 reply; 2+ messages in thread
From: Zhi Yong Wu @ 2013-12-06 6:16 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-kernel, Zhi Yong Wu
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
drivers/net/macvtap.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 9093004..957cc5c 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -876,6 +876,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;
}
--
1.7.6.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 2/2] tun: update file current position
2013-12-06 6:16 [PATCH 1/2] macvtap: update file current position Zhi Yong Wu
@ 2013-12-06 6:16 ` Zhi Yong Wu
0 siblings, 0 replies; 2+ messages in thread
From: Zhi Yong Wu @ 2013-12-06 6:16 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-kernel, Zhi Yong Wu
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
drivers/net/tun.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 782e38b..e26cbea 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1356,6 +1356,8 @@ static ssize_t tun_chr_aio_read(struct kiocb *iocb, const struct iovec *iv,
ret = tun_do_read(tun, tfile, iocb, iv, len,
file->f_flags & O_NONBLOCK);
ret = min_t(ssize_t, ret, len);
+ if (ret > 0)
+ iocb->ki_pos = ret;
out:
tun_put(tun);
return ret;
--
1.7.6.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-12-06 6:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-06 6:16 [PATCH 1/2] macvtap: update file current position Zhi Yong Wu
2013-12-06 6:16 ` [PATCH 2/2] tun: " Zhi Yong Wu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).