From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=51083 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PxqLQ-0002hX-V2 for qemu-devel@nongnu.org; Thu, 10 Mar 2011 19:36:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PxqLO-0003bh-Fi for qemu-devel@nongnu.org; Thu, 10 Mar 2011 19:36:40 -0500 Received: from mail-iw0-f173.google.com ([209.85.214.173]:60505) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PxqLO-0003ba-92 for qemu-devel@nongnu.org; Thu, 10 Mar 2011 19:36:38 -0500 Received: by iwl42 with SMTP id 42so2476970iwl.4 for ; Thu, 10 Mar 2011 16:36:37 -0800 (PST) From: Benjamin Poirier Date: Thu, 10 Mar 2011 19:35:55 -0500 Message-Id: <1299803757-26812-2-git-send-email-benjamin.poirier@gmail.com> In-Reply-To: <1299803757-26812-1-git-send-email-benjamin.poirier@gmail.com> References: <1299803757-26812-1-git-send-email-benjamin.poirier@gmail.com> Subject: [Qemu-devel] [PATCH v6 1/3] rtl8139: cleanup FCS calculation List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , Jason Wang , "Michael S. Tsirkin" clean out ifdef's around ethernet checksum calculation Signed-off-by: Benjamin Poirier Cc: Igor V. Kovalenko Cc: Jason Wang Cc: Michael S. Tsirkin Cc: Blue Swirl --- hw/rtl8139.c | 20 +++----------------- 1 files changed, 3 insertions(+), 17 deletions(-) diff --git a/hw/rtl8139.c b/hw/rtl8139.c index a22530c..3772ac1 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -47,6 +47,9 @@ * Darwin) */ +/* For crc32 */ +#include + #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 -#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 */ -- 1.7.2.3