[PULL,for-2.4,00/16] Net patches

The following changes since commit f793d97e454a56d17e404004867985622ca1a63b:

  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2015-07-24 13:07:10 +0100)

are available in the git repository at:

  git://github.com/stefanha/qemu.git tags/net-pull-request

for you to fetch changes up to f9f7492ea4a9dda538fedeec31399fb940533a16:

  axienet: Flush queued packets when rx is done (2015-07-27 14:12:18 +0100)

----------------------------------------------------------------
Pull request

Here are NIC fixes from Fam Zheng that prevent rx hangs (caused by NIC models
where .can_receive() stops rx but qemu_flush_queued_packets() isn't called).

----------------------------------------------------------------

Fam Zheng (12):
  xgmac: Drop packets with eth_can_rx is false.
  pcnet: Drop pcnet_can_receive
  eepro100: Drop nic_can_receive
  usbnet: Drop usbnet_can_receive
  etsec: Move etsec_can_receive into etsec_receive
  etsec: Flush queue when rx buffer is consumed
  mcf_fec: Drop mcf_fec_can_receive
  milkymist-minimac2: Flush queued packets when link comes up
  mipsnet: Flush queued packets when receiving is enabled
  stellaris_enet: Flush queued packets when read done
  dp8393x: Flush packets when link comes up
  axienet: Flush queued packets when rx is done

Greg Ungerer (4):
  hw/net: create common collection of MII definitions
  hw/net: add ANLPAR bit definitions to generic mii
  hw/net: add simple phy support to mcf_fec driver
  hw/net: fix mcf_fec driver receiver

 hw/net/dp8393x.c                |  8 +++++
 hw/net/eepro100.c               | 11 ------
 hw/net/fsl_etsec/etsec.c        | 20 +++++------
 hw/net/fsl_etsec/etsec.h        |  4 ++-
 hw/net/fsl_etsec/rings.c        | 17 +++++----
 hw/net/lance.c                  |  1 -
 hw/net/mcf_fec.c                | 63 ++++++++++++++++++++++++++++------
 hw/net/milkymist-minimac2.c     | 33 +++++++++---------
 hw/net/mipsnet.c                |  9 +++--
 hw/net/pcnet-pci.c              |  1 -
 hw/net/pcnet.c                  |  9 -----
 hw/net/pcnet.h                  |  1 -
 hw/net/stellaris_enet.c         | 14 +++-----
 hw/net/xgmac.c                  |  8 ++---
 hw/net/xilinx_axienet.c         | 17 ++++++---
 hw/usb/dev-network.c            | 20 +++--------
 include/hw/net/allwinner_emac.h | 40 +---------------------
 include/hw/net/mii.h            | 76 +++++++++++++++++++++++++++++++++++++++++
 trace-events                    |  1 -
 19 files changed, 210 insertions(+), 143 deletions(-)
 create mode 100644 include/hw/net/mii.h

On 27 July 2015 at 14:51, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit f793d97e454a56d17e404004867985622ca1a63b:
>
>   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2015-07-24 13:07:10 +0100)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/net-pull-request
>
> for you to fetch changes up to f9f7492ea4a9dda538fedeec31399fb940533a16:
>
>   axienet: Flush queued packets when rx is done (2015-07-27 14:12:18 +0100)
>
> ----------------------------------------------------------------
> Pull request
>
> Here are NIC fixes from Fam Zheng that prevent rx hangs (caused by NIC models
> where .can_receive() stops rx but qemu_flush_queued_packets() isn't called).
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM