| From foo@baz Mon Jan 13 09:44:41 PST 2014 |
| From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> |
| Date: Fri, 6 Dec 2013 14:16:50 +0800 |
| Subject: macvtap: update file current position |
| |
| From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> |
| |
| [ 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 | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/drivers/net/macvtap.c |
| +++ b/drivers/net/macvtap.c |
| @@ -886,6 +886,8 @@ static ssize_t macvtap_aio_read(struct k |
| |
| 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; |
| } |
