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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_sysfs.c
Simple merge

diff --cc drivers/net/ethernet/nvidia/forcedeth.c
Simple merge

diff --cc drivers/net/macvtap.c
index 4c6f84c,957cc5c..4a34bcb
--- 1/drivers/net/macvtap.c
--- 2/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 6b0b2a0,e26cbea..3c5a8d8
--- 1/drivers/net/tun.c
--- 2/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;

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

diff --cc net/sched/act_skbedit.c
Simple merge

diff --cc net/sctp/transport.c
Simple merge