diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2016-12-06 10:24:24 +0000 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2016-12-06 10:24:24 +0000 |
| commit | ce1f3e88f8338cff5bac3b1d1289f8f2260c7247 (patch) | |
| tree | 969d9f4319001066676e4636dde6eab22ebcc406 /hw/net/mcf_fec.c | |
| parent | 8a04c80f9fd5d9c0ef8b512fe2f51457ba255ec3 (diff) | |
| parent | 9f5832d34b0c155e9538a745c80e441aed257670 (diff) | |
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: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw/net/mcf_fec.c')
| -rw-r--r-- | hw/net/mcf_fec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c index dc61bac2fc..4025eb3b33 100644 --- a/hw/net/mcf_fec.c +++ b/hw/net/mcf_fec.c @@ -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); |