| From foo@baz Mon Jan 13 09:39:01 PST 2014 |
| From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> |
| Date: Fri, 6 Dec 2013 14:16:51 +0800 |
| Subject: tun: update file current position |
| |
| From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> |
| |
| [ Upstream commit d0b7da8afa079ffe018ab3e92879b7138977fc8f ] |
| |
| 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/tun.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/drivers/net/tun.c |
| +++ b/drivers/net/tun.c |
| @@ -1412,6 +1412,8 @@ static ssize_t tun_chr_aio_read(struct k |
| 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; |
