Index: hw/rtl8139.c

===================================================================

RCS file: /sources/qemu/qemu/hw/rtl8139.c,v

retrieving revision 1.10

retrieving revision 1.11

diff -u -r1.10 -r1.11

--- hw/rtl8139.c	11 Jul 2007 22:48:58 -0000	1.10

+++ hw/rtl8139.c	1 Aug 2007 13:10:29 -0000	1.11

@@ -53,9 +53,8 @@

 /* debug RTL8139 card C+ mode only */

 //#define DEBUG_RTL8139CP 1

-/* RTL8139 provides frame CRC with received packet, this feature seems to be

-   ignored by most drivers, disabled by default */

-//#define RTL8139_CALCULATE_RXCRC 1

+/* Calculate CRCs properly on Rx packets */

+#define RTL8139_CALCULATE_RXCRC 1

 /* Uncomment to enable on-board timer interrupts */

 //#define RTL8139_ONBOARD_TIMER 1

@@ -747,7 +746,7 @@

         int wrapped = MOD2(s->RxBufAddr + size, s->RxBufferSize);

         /* write packet data */

-        if (wrapped && s->RxBufferSize < 65536 && !rtl8139_RxWrap(s))

+        if (wrapped && !(s->RxBufferSize < 65536 && rtl8139_RxWrap(s)))

         {

             DEBUG_PRINT((">>> RTL8139: rx packet wrapped in buffer at %d\n", size-wrapped));

@@ -1023,7 +1022,7 @@

         /* write checksum */

 #if defined (RTL8139_CALCULATE_RXCRC)

-        val = cpu_to_le32(crc32(~0, buf, size));

+        val = cpu_to_le32(crc32(0, buf, size));

 #else

         val = 0;

 #endif

@@ -1129,7 +1128,7 @@

         /* write checksum */

 #if defined (RTL8139_CALCULATE_RXCRC)

-        val = cpu_to_le32(crc32(~0, buf, size));

+        val = cpu_to_le32(crc32(0, buf, size));

 #else

         val = 0;

 #endif