diff options
| author | Benjamin Poirier <benjamin.poirier@gmail.com> | 2011-03-22 19:11:21 -0400 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-03-26 11:10:34 +0000 |
| commit | 2c406b8fc8fc09853e74924d7067712d7a75108f (patch) | |
| tree | e23cf8cb93a642f008c927c312253dddd5600b8a | |
| parent | d6e58090fed20e30e6966007bc4df0c04324d9e7 (diff) | |
| download | qemu-2c406b8fc8fc09853e74924d7067712d7a75108f.tar.gz qemu-2c406b8fc8fc09853e74924d7067712d7a75108f.tar.bz2 qemu-2c406b8fc8fc09853e74924d7067712d7a75108f.zip | |
rtl8139: cleanup FCS calculation
clean out ifdef's around ethernet checksum calculation
Signed-off-by: Benjamin Poirier <benjamin.poirier@gmail.com>
Acked-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | hw/rtl8139.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/hw/rtl8139.c b/hw/rtl8139.c index 0ba51fc11a..d843aa0273 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -47,6 +47,9 @@ * Darwin) */ +/* For crc32 */ +#include <zlib.h> + #include "hw.h" #include "pci.h" #include "qemu-timer.h" @@ -62,14 +65,6 @@ /* debug RTL8139 card C+ mode only */ //#define DEBUG_RTL8139CP 1 -/* Calculate CRCs properly on Rx packets */ -#define RTL8139_CALCULATE_RXCRC 1 - -#if defined(RTL8139_CALCULATE_RXCRC) -/* For crc32 */ -#include <zlib.h> -#endif - #define SET_MASKED(input, mask, curr) \ ( ( (input) & ~(mask) ) | ( (curr) & (mask) ) ) @@ -1030,11 +1025,7 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_ } /* write checksum */ -#if defined (RTL8139_CALCULATE_RXCRC) val = cpu_to_le32(crc32(0, buf, size)); -#else - val = 0; -#endif cpu_physical_memory_write( rx_addr+size, (uint8_t *)&val, 4); /* first segment of received packet flag */ @@ -1136,12 +1127,7 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_ rtl8139_write_buffer(s, buf, size); /* write checksum */ -#if defined (RTL8139_CALCULATE_RXCRC) val = cpu_to_le32(crc32(0, buf, size)); -#else - val = 0; -#endif - rtl8139_write_buffer(s, (uint8_t *)&val, 4); /* correct buffer write pointer */ |