The following changes since commit 97556fe80e4f7252300b3498b3477fb4295153a3:
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2016-03-08 04:53:37 +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 362786f14a753d8a5256ef97d7c10ed576d6572b: net: check packet payload length (2016-03-08 15:34:18 +0800) ---------------------------------------------------------------- - netfilter could be disabled and enabled through qom-set now - fix netfilter crash when specifiying wrong parameters - rocker switch now can allow user to specifiy world - fix OOB access for ne2000 Changes from V1: - drop mirror from the pull request ---------------------------------------------------------------- Jason Wang (1): net: filter: correctly remove filter from the list during finalization Jiri Pirko (4): rocker: forbid to change world type rocker: return -ENOMEM in case of some world alloc fails rocker: add name field into WorldOps ale let world specify its name rocker: allow user to specify rocker world by property Paolo Bonzini (1): net: simplify net_init_tap_one logic Prasad J Pandit (2): net: ne2000: check ring buffer control registers net: check packet payload length Thomas Huth (1): MAINTAINERS: Add entries for include/net/ files Vincenzo Maffione (1): net: netmap: probe netmap interface for virtio-net header zhanghailiang (2): filter: Add 'status' property for filter object filter-buffer: Add status_changed callback processing MAINTAINERS | 2 ++ hw/net/ne2000.c | 4 +++ hw/net/rocker/rocker.c | 38 ++++++++++++++++++++++++++-- hw/net/rocker/rocker_fp.c | 5 ++++ hw/net/rocker/rocker_fp.h | 1 + hw/net/rocker/rocker_of_dpa.c | 1 + hw/net/rocker/rocker_world.c | 7 +---- hw/net/rocker/rocker_world.h | 1 + include/net/filter.h | 4 +++ net/checksum.c | 10 ++++++-- net/filter-buffer.c | 34 ++++++++++++++++++++----- net/filter.c | 44 +++++++++++++++++++++++++++++++- net/netmap.c | 59 ++++++++++++++++++++++++++++--------------- net/tap.c | 4 +-- qemu-options.hx | 4 ++- 15 files changed, 177 insertions(+), 41 deletions(-)
