From: Greg Ungerer Date: Fri, 26 Jun 2015 05:27:16 +0000 (+1000) Subject: hw/net: fix mcf_fec driver receiver X-Git-Tag: v2.4.0-rc3~12^2~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=491a1f494ed4c0d1a8593dd04b645f8e63c4cfae;p=thirdparty%2Fqemu.git hw/net: fix mcf_fec driver receiver The network mcf_fec driver emulated receive side method is returning a result of 0 causing the network layer to disable receive for this emulated device. This results in the guest only ever receiving one packet. Fix the recieve side processing to return the number of bytes that we passed back through to the guest. Signed-off-by: Greg Ungerer Reviewed-by: Stefan Hajnoczi Message-id: 1435296436-12152-5-git-send-email-gerg@uclinux.org Signed-off-by: Stefan Hajnoczi --- diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c index ea590172b9e..e63af1be346 100644 --- a/hw/net/mcf_fec.c +++ b/hw/net/mcf_fec.c @@ -413,6 +413,7 @@ static ssize_t mcf_fec_receive(NetClientState *nc, const uint8_t *buf, size_t si uint32_t buf_addr; uint8_t *crc_ptr; unsigned int buf_len; + size_t retsize; DPRINTF("do_rx len %d\n", size); if (!s->rx_enabled) { @@ -432,6 +433,7 @@ static ssize_t mcf_fec_receive(NetClientState *nc, const uint8_t *buf, size_t si flags |= FEC_BD_LG; } addr = s->rx_descriptor; + retsize = size; while (size > 0) { mcf_fec_read_bd(&bd, addr); if ((bd.flags & FEC_BD_E) == 0) { @@ -476,7 +478,7 @@ static ssize_t mcf_fec_receive(NetClientState *nc, const uint8_t *buf, size_t si s->rx_descriptor = addr; mcf_fec_enable_rx(s); mcf_fec_update(s); - return size; + return retsize; } static const MemoryRegionOps mcf_fec_ops = {