]>
Commit | Line | Data |
---|---|---|
963efa89 GKH |
1 | From foo@baz Mon Jan 13 09:28:30 PST 2014 |
2 | From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> | |
3 | Date: Fri, 6 Dec 2013 14:16:50 +0800 | |
4 | Subject: macvtap: update file current position | |
5 | ||
6 | From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> | |
7 | ||
8 | [ Upstream commit e6ebc7f16ca1434a334647aa56399c546be4e64b ] | |
9 | ||
10 | Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> | |
11 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
12 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
13 | --- | |
14 | drivers/net/macvtap.c | 2 ++ | |
15 | 1 file changed, 2 insertions(+) | |
16 | ||
17 | --- a/drivers/net/macvtap.c | |
18 | +++ b/drivers/net/macvtap.c | |
19 | @@ -905,6 +905,8 @@ static ssize_t macvtap_aio_read(struct k | |
20 | ||
21 | ret = macvtap_do_read(q, iocb, iv, len, file->f_flags & O_NONBLOCK); | |
22 | ret = min_t(ssize_t, ret, len); /* XXX copied from tun.c. Why? */ | |
23 | + if (ret > 0) | |
24 | + iocb->ki_pos = ret; | |
25 | out: | |
26 | return ret; | |
27 | } |