[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 08/16] net/dp8393x: always calculate proper check
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v3 08/16] net/dp8393x: always calculate proper checksums |
Date: |
Wed, 3 Jun 2015 22:45:42 +0200 |
Signed-off-by: Hervé Poussineau <address@hidden>
Reviewed-by: Aurelien Jarno <address@hidden>
---
hw/net/dp8393x.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index 2297231..093f0cc 100644
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -21,16 +21,10 @@
#include "qemu/timer.h"
#include "net/net.h"
#include "hw/mips/mips.h"
+#include <zlib.h>
//#define DEBUG_SONIC
-/* Calculate CRCs properly on Rx packets */
-#define SONIC_CALCULATE_RXCRC
-
-#if defined(SONIC_CALCULATE_RXCRC)
-/* For crc32 */
-#include <zlib.h>
-#endif
#ifdef DEBUG_SONIC
#define DPRINTF(fmt, ...) \
@@ -764,11 +758,7 @@ static ssize_t nic_receive(NetClientState *nc, const
uint8_t * buf, size_t size)
s->regs[SONIC_TRBA0] = s->regs[SONIC_CRBA0];
/* Calculate the ethernet checksum */
-#ifdef SONIC_CALCULATE_RXCRC
checksum = cpu_to_le32(crc32(0, buf, rx_len));
-#else
- checksum = 0;
-#endif
/* Put packet into RBA */
DPRINTF("Receive packet at %08x\n", (s->regs[SONIC_CRBA1] << 16) |
s->regs[SONIC_CRBA0]);
--
2.1.4
- [Qemu-devel] [PATCH v3 00/16] net/dp8393x and dma/rc4030 improvements, Hervé Poussineau, 2015/06/03
- [Qemu-devel] [PATCH v3 05/16] dma/rc4030: document register at offset 0x210, Hervé Poussineau, 2015/06/03
- [Qemu-devel] [PATCH v3 04/16] dma/rc4030: do not use old_mmio accesses, Hervé Poussineau, 2015/06/03
- [Qemu-devel] [PATCH v3 01/16] mips jazz: compile only in 64 bit, Hervé Poussineau, 2015/06/03
- [Qemu-devel] [PATCH v3 06/16] dma/rc4030: use trace events instead of custom logging, Hervé Poussineau, 2015/06/03
- [Qemu-devel] [PATCH v3 02/16] dma/rc4030: create custom DMA address space, Hervé Poussineau, 2015/06/03
- [Qemu-devel] [PATCH v3 08/16] net/dp8393x: always calculate proper checksums,
Hervé Poussineau <=
- [Qemu-devel] [PATCH v3 07/16] dma/rc4030: convert to QOM, Hervé Poussineau, 2015/06/03
- [Qemu-devel] [PATCH v3 09/16] net/dp8393x: do not use old_mmio accesses, Hervé Poussineau, 2015/06/03
- [Qemu-devel] [PATCH v3 03/16] dma/rc4030: use AddressSpace and address_space_rw in users, Hervé Poussineau, 2015/06/03
- [Qemu-devel] [PATCH v3 13/16] net/dp8393x: add load/save support, Hervé Poussineau, 2015/06/03
- [Qemu-devel] [PATCH v3 15/16] net/dp8393x: fix hardware reset, Hervé Poussineau, 2015/06/03
- [Qemu-devel] [PATCH v3 14/16] net/dp8393x: correctly reset in_use field, Hervé Poussineau, 2015/06/03
- [Qemu-devel] [PATCH v3 10/16] net/dp8393x: use dp8393x_ prefix for all functions, Hervé Poussineau, 2015/06/03
- [Qemu-devel] [PATCH v3 11/16] net/dp8393x: QOM'ify, Hervé Poussineau, 2015/06/03
- [Qemu-devel] [PATCH v3 16/16] [RFC] dma/rc4030: do multiple calls to address_space_rw when doing DMA transfers, Hervé Poussineau, 2015/06/03