3.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhi Yong Wu <wuzhy@xxxxxxxxxxxxxxxxxx> [ Upstream commit e6ebc7f16ca1434a334647aa56399c546be4e64b ] Signed-off-by: Zhi Yong Wu <wuzhy@xxxxxxxxxxxxxxxxxx> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- 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; } -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html