[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/33] dp8393x: Mask EOL bit from descriptor addresses, take 2
From: |
Laurent Vivier |
Subject: |
[PULL 01/33] dp8393x: Mask EOL bit from descriptor addresses, take 2 |
Date: |
Mon, 9 Mar 2020 16:08:05 +0100 |
From: Finn Thain <address@hidden>
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 <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <alpine.LNX.2.22.394.2003041421280.12@nippy.intranet>
Signed-off-by: Laurent Vivier <address@hidden>
---
hw/net/dp8393x.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index 8a3504d9628e..81fc13ee9fa7 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;
}
--
2.24.1
- [PULL 00/33] Trivial branch patches, Laurent Vivier, 2020/03/09
- [PULL 03/33] build-sys: Move the print-variable rule to rules.mak, Laurent Vivier, 2020/03/09
- [PULL 08/33] vl: Add missing "hw/boards.h" include, Laurent Vivier, 2020/03/09
- [PULL 05/33] hw/net/e1000: Add readops/writeops typedefs, Laurent Vivier, 2020/03/09
- [PULL 06/33] hw/net/e1000: Move macreg[] arrays to .rodata to save 1MiB of .data, Laurent Vivier, 2020/03/09
- [PULL 04/33] hw/audio/fmopl: Fix a typo twice, Laurent Vivier, 2020/03/09
- [PULL 02/33] maint: Include top-level *.rst files early in git diff, Laurent Vivier, 2020/03/09
- [PULL 11/33] hw/timer: Remove unused "ui/console.h" header, Laurent Vivier, 2020/03/09
- [PULL 12/33] hw/usb/dev-storage: Remove unused "ui/console.h" header, Laurent Vivier, 2020/03/09
- [PULL 01/33] dp8393x: Mask EOL bit from descriptor addresses, take 2,
Laurent Vivier <=
- [PULL 19/33] hw/pci-host/q35: Include "qemu/range.h", Laurent Vivier, 2020/03/09
- [PULL 13/33] hw/i386/intel_iommu: Remove unused includes, Laurent Vivier, 2020/03/09
- [PULL 15/33] hw/alpha/dp264: Include "net/net.h", Laurent Vivier, 2020/03/09
- [PULL 09/33] hw/southbridge/ich9: Removed unused headers, Laurent Vivier, 2020/03/09
- [PULL 07/33] virtfs-proxy-helper: Make the helper_opts[] array const, Laurent Vivier, 2020/03/09
- [PULL 18/33] hw/timer/hpet: Include "exec/address-spaces.h", Laurent Vivier, 2020/03/09
- [PULL 17/33] hw/acpi/cpu_hotplug: Include "hw/pci/pci.h", Laurent Vivier, 2020/03/09
- [PULL 24/33] hw/pci-host/q35: Remove unused includes, Laurent Vivier, 2020/03/09
- [PULL 10/33] hw/i386/ioapic_internal: Remove unused "hw/i386/ioapic.h" header, Laurent Vivier, 2020/03/09
- [PULL 21/33] hw/pci-host/piix: Include "qemu/range.h", Laurent Vivier, 2020/03/09