[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/17] hw/net/cadence_gem: Remove dead code
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 12/17] hw/net/cadence_gem: Remove dead code |
Date: |
Tue, 13 May 2014 16:31:34 +0100 |
Commit 191946c moved the code to handle padding to minimum
length from after the handling of the CRC to before it.
This means that the CRC code doesn't need to cope with the
possibility that the size is less than 60; remove this
dead code.
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
---
hw/net/cadence_gem.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index a779658..47e7038 100644
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -717,7 +717,6 @@ static ssize_t gem_receive(NetClientState *nc, const
uint8_t *buf, size_t size)
rxbuf_ptr = (void *)buf;
} else {
unsigned crc_val;
- int crc_offset;
/* The application wants the FCS field, which QEMU does not provide.
* We must try and caclculate one.
@@ -727,12 +726,7 @@ static ssize_t gem_receive(NetClientState *nc, const
uint8_t *buf, size_t size)
memset(rxbuf + size, 0, sizeof(rxbuf) - size);
rxbuf_ptr = rxbuf;
crc_val = cpu_to_le32(crc32(0, rxbuf, MAX(size, 60)));
- if (size < 60) {
- crc_offset = 60;
- } else {
- crc_offset = size;
- }
- memcpy(rxbuf + crc_offset, &crc_val, sizeof(crc_val));
+ memcpy(rxbuf + size, &crc_val, sizeof(crc_val));
bytes_to_copy += 4;
size += 4;
--
1.9.2
- [Qemu-devel] [PULL 00/17] target-arm queue, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 17/17] hw/arm/omap_gpmc: Avoid buffer overrun filling prefetch FIFO, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 12/17] hw/net/cadence_gem: Remove dead code,
Peter Maydell <=
- [Qemu-devel] [PULL 09/17] hw/net/stellaris_enet: Convert to vmstate, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 15/17] hw/timer/exynos4210_mct: Avoid overflow in exynos4210_ltick_recalc_count, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 03/17] hw/net/stellaris_enet: Restructure tx_fifo code to avoid buffer overrun, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 14/17] hw/dma/omap_dma: Add (uint32_t) casts when shifting uint16_t by 16, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 16/17] hw/arm/stellaris: Correct handling of GPTM TAR register, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 10/17] target-arm/helper.c: Don't flush the TLB if SCTLR is rewritten unchanged, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 13/17] hw/arm/omap1: Avoid unintended sign extension writing omap_rtc YEARS_REG, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 11/17] hw/intc/allwinner-a10-pic: Add missing 'break', Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 06/17] hw/net/stellaris_enet: Correctly implement the TR and THR registers, Peter Maydell, 2014/05/13
- [Qemu-devel] [PULL 05/17] hw/net/stellaris_enet: Rewrite tx fifo handling code, Peter Maydell, 2014/05/13