]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 20 Jul 2015 17:26:53 +0000 (18:26 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 20 Jul 2015 17:26:53 +0000 (18:26 +0100)
# gpg: Signature made Mon Jul 20 18:25:14 2015 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/net-pull-request:
  net: Flush queued packets when guest resumes
  lan9118: Drop lan9118_can_receive
  etraxfs_eth: Drop eth_can_receive
  musicpal: Drop eth_can_receive
  net/vmxnet3: Fix RX TCP/UDP checksum on partially summed packets
  net/vmxnet3: Refactor 'vmxnet_rx_pkt_attach_data'
  socket: pass correct size in net_socket_send()

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

Trivial merge