Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
commit40428feaeb9708f1bc5b2582d9f071a3db907c07
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 28 Jun 2016 09:32:13 +0000 (28 10:32 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 28 Jun 2016 09:32:13 +0000 (28 10:32 +0100)
tree06ae2966b14cee2339af160475d5ff075c892c03
parentaa4b04a09cf79adc3c133fe27d9d06d5c3fc1db9
parentc508277335e3b6b20cf18e6ea3a35c1fa835c64a
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging

# gpg: Signature made Tue 28 Jun 2016 04:29:53 BST
# gpg:                using RSA key 0xEF04965B398D6211
# 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:
  vmxnet3: Fix reading/writing guest memory specially when behind an IOMMU
  rtl8139: save/load RxMulOk counter (again)
  Change net/socket.c to use socket_*() functions
  net: mipsnet: check transmit buffer size before sending
  net: fix qemu_announce_self not emitting packets

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>