Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Tue 08 Mar 2016 07:46:08 GMT using RSA key ID 398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211
* remotes/jasowang/tags/net-pull-request:
net: check packet payload length
filter-buffer: Add status_changed callback processing
filter: Add 'status' property for filter object
rocker: allow user to specify rocker world by property
rocker: add name field into WorldOps ale let world specify its name
rocker: return -ENOMEM in case of some world alloc fails
rocker: forbid to change world type
net: netmap: probe netmap interface for virtio-net header
net: simplify net_init_tap_one logic
MAINTAINERS: Add entries for include/net/ files
net: filter: correctly remove filter from the list during finalization
net: ne2000: check ring buffer control registers
Signed-off-by:
Peter Maydell <peter.maydell@linaro.org>
No related branches found
No related tags found
Showing
- MAINTAINERS 2 additions, 0 deletionsMAINTAINERS
- hw/net/ne2000.c 4 additions, 0 deletionshw/net/ne2000.c
- hw/net/rocker/rocker.c 36 additions, 2 deletionshw/net/rocker/rocker.c
- hw/net/rocker/rocker_fp.c 5 additions, 0 deletionshw/net/rocker/rocker_fp.c
- hw/net/rocker/rocker_fp.h 1 addition, 0 deletionshw/net/rocker/rocker_fp.h
- hw/net/rocker/rocker_of_dpa.c 1 addition, 0 deletionshw/net/rocker/rocker_of_dpa.c
- hw/net/rocker/rocker_world.c 1 addition, 6 deletionshw/net/rocker/rocker_world.c
- hw/net/rocker/rocker_world.h 1 addition, 0 deletionshw/net/rocker/rocker_world.h
- include/net/filter.h 4 additions, 0 deletionsinclude/net/filter.h
- net/checksum.c 8 additions, 2 deletionsnet/checksum.c
- net/filter-buffer.c 28 additions, 6 deletionsnet/filter-buffer.c
- net/filter.c 43 additions, 1 deletionnet/filter.c
- net/netmap.c 38 additions, 21 deletionsnet/netmap.c
- net/tap.c 2 additions, 2 deletionsnet/tap.c
- qemu-options.hx 3 additions, 1 deletionqemu-options.hx
Loading
Please register or sign in to comment