Commit ce1f3e88 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'jasowang/tags/net-pull-request' into staging 



# gpg: Signature made Tue 06 Dec 2016 02:24:23 AM GMT
# gpg:                using RSA key 0xEF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* jasowang/tags/net-pull-request:
  fsl_etsec: Fix various small problems in hexdump code
  fsl_etsec: Pad short payloads with zeros
  net: mcf: check receive buffer size register value

Message-id: 1480991552-14360-1-git-send-email-jasowang@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents 8a04c80f 9f5832d3

hw/net/fsl_etsec/etsec.c

+2 −2
Original line number Diff line number Diff line
@@ -348,8 +348,8 @@ static ssize_t etsec_receive(NetClientState *nc, 
    eTSEC *etsec = qemu_get_nic_opaque(nc);



#if defined(HEX_DUMP)

    fprintf(stderr, "%s receive size:%d\n", etsec->nic->nc.name, size);

    qemu_hexdump(buf, stderr, "", size);

    fprintf(stderr, "%s receive size:%zd\n", nc->name, size);

    qemu_hexdump((void *)buf, stderr, "", size);

#endif

    /* Flush is unnecessary as are already in receiving path */

    etsec->need_flush = false;

hw/net/fsl_etsec/rings.c

+8 −0
Original line number Diff line number Diff line
@@ -474,6 +474,14 @@ static void rx_init_frame(eTSEC *etsec, const uint8_t *buf, size_t size) 
    /* CRC padding (We don't have to compute the CRC) */

    etsec->rx_padding = 4;



    /*

     * Ensure that payload length + CRC length is at least 802.3

     * minimum MTU size bytes long (64)

     */

    if (etsec->rx_buffer_len < 60) {

        etsec->rx_padding += 60 - etsec->rx_buffer_len;

    }



    etsec->rx_first_in_frame = 1;

    etsec->rx_remaining_data = etsec->rx_buffer_len;

    RING_DEBUG("%s: rx_buffer_len:%u rx_padding+crc:%u\n", __func__,

hw/net/mcf_fec.c

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static void mcf_fec_write(void *opaque, hwaddr addr, 
        s->tx_descriptor = s->etdsr;

        break;

    case 0x188:

        s->emrbr = value & 0x7f0;

        s->emrbr = value > 0 ? value & 0x7F0 : 0x7F0;

        break;

    default:

        hw_error("mcf_fec_write Bad address 0x%x\n", (int)addr);