From: David S. Miller <davem@davemloft.net>
Date: Tue, 10 Dec 2013 01:20:14 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=34f9f437104b86f6ddfa2770e2cd852846385dc3;p=linux-beck.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Merge 'net' into 'net-next' to get the AF_PACKET bug fix that
Daniel's direct transmit changes depend upon.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

34f9f437104b86f6ddfa2770e2cd852846385dc3
diff --cc drivers/net/macvtap.c
index 4c6f84c79e95,957cc5c3653d..4a34bcb6549f
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@@ -870,8 -874,10 +870,10 @@@ static ssize_t macvtap_aio_read(struct 
  		goto out;
  	}
  
 -	ret = macvtap_do_read(q, iocb, iv, len, file->f_flags & O_NONBLOCK);
 +	ret = macvtap_do_read(q, 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;
  }
diff --cc drivers/net/tun.c
index 6b0b2a057a47,e26cbea1ce68..3c5a8d8cde50
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@@ -1352,9 -1353,11 +1352,11 @@@ static ssize_t tun_chr_aio_read(struct 
  		goto out;
  	}
  
 -	ret = tun_do_read(tun, tfile, iocb, iv, len,
 +	ret = tun_do_read(tun, tfile, 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;