diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2020-03-04 14:23:05 +1100 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2020-03-09 15:59:31 +0100 |
| commit | a0cf4297d6b8d88047ab00c467f14aecf9c2a8eb (patch) | |
| tree | 719510fdcf8861b00a59d0b09ee0921da3c74320 /hw/net | |
| parent | 7a5853cec479a448edae0fb2aaf4e2f78c9c774d (diff) | |
| download | qemu-a0cf4297d6b8d88047ab00c467f14aecf9c2a8eb.zip qemu-a0cf4297d6b8d88047ab00c467f14aecf9c2a8eb.tar.gz qemu-a0cf4297d6b8d88047ab00c467f14aecf9c2a8eb.tar.bz2 | |
dp8393x: Mask EOL bit from descriptor addresses, take 2
A portion of a recent patch got lost due to a merge snafu. That patch is
now commit 88f632fbb1 ("dp8393x: Mask EOL bit from descriptor addresses").
This patch restores the portion that got lost.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <alpine.LNX.2.22.394.2003041421280.12@nippy.intranet>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'hw/net')
| -rw-r--r-- | hw/net/dp8393x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 8a3504d..81fc13e 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -525,8 +525,8 @@ static void dp8393x_do_transmit_packets(dp8393xState *s) * (4 + 3 * s->regs[SONIC_TFC]), MEMTXATTRS_UNSPECIFIED, s->data, size); - s->regs[SONIC_CTDA] = dp8393x_get(s, width, 0) & ~0x1; - if (dp8393x_get(s, width, 0) & SONIC_DESC_EOL) { + s->regs[SONIC_CTDA] = dp8393x_get(s, width, 0); + if (s->regs[SONIC_CTDA] & SONIC_DESC_EOL) { /* EOL detected */ break; } |