The following changes since commit 0430891ce162b986c6e02a7729a942ecd2a32ca4:
hw: Clean up includes (2016-01-29 15:07:25 +0000) are available in the git repository at: https://github.com/jasowang/qemu.git tags/net-pull-request for you to fetch changes up to e8a7a1a574ed6728422959c8aa79ca584cdd1d4d: net/filter: Fix the output information for command 'info network' (2016-02-02 10:21:28 +0800) ---------------------------------------------------------------- Major changes for net: - preparation for ipv6 support in slirp - fix tx infinite loops of e1000 - fix cadence_gem buffer overflow - rx netfilter were gone in reverse for future complex netfilter setups ---------------------------------------------------------------- Guillaume Subiron (9): slirp: goto bad in udp_input if sosendto fails slirp: Generalizing and neutralizing ARP code slirp: Adding address family switch for produced frames slirp: Make Socket structure IPv6 compatible slirp: Factorizing address translation slirp: Factorizing and cleaning solookup() slirp: Add sockaddr_equal, make solookup family-agnostic slirp: Make udp_attach IPv6 compatible slirp: Adding family argument to tcp_fconnect() Laszlo Ersek (1): e1000: eliminate infinite loops on out-of-bounds transfer start Li Zhijian (1): net: always walk through filters in reverse if traffic is egress Michael S. Tsirkin (1): cadence_gem: fix buffer overflow Prasad J Pandit (1): net: cadence_gem: check packet size in gem_recieve Thomas Huth (2): net/slirp: Tell the users when they are using deprecated options qemu-doc: Do not promote deprecated -smb and -redir options Vincenzo Maffione (1): net: netmap: use nm_open() to open netmap ports zhanghailiang (1): net/filter: Fix the output information for command 'info network' hw/net/cadence_gem.c | 12 ++++ hw/net/e1000.c | 6 +- include/net/filter.h | 1 - include/net/net.h | 2 +- net/filter.c | 43 +++++++------- net/net.c | 52 ++++++++++++++--- net/netmap.c | 97 +++++++++++-------------------- net/slirp.c | 3 + os-posix.c | 3 + qemu-doc.texi | 9 +-- slirp/bootp.c | 2 +- slirp/ip_icmp.c | 23 +++----- slirp/mbuf.c | 2 +- slirp/mbuf.h | 2 +- slirp/slirp.c | 116 +++++++++++++++++++++++++++++-------- slirp/slirp.h | 2 +- slirp/socket.c | 158 ++++++++++++++++++++++++++++++++++++++------------- slirp/socket.h | 49 ++++++++++++++-- slirp/tcp_input.c | 30 +++++----- slirp/tcp_subr.c | 40 ++++--------- slirp/tftp.c | 6 +- slirp/udp.c | 74 +++++++----------------- slirp/udp.h | 5 +- vl.c | 6 ++ 24 files changed, 445 insertions(+), 298 deletions(-)