[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [4972] e1000: use common checksumming code
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [4972] e1000: use common checksumming code |
Date: |
Tue, 29 Jul 2008 19:41:19 +0000 |
Revision: 4972
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4972
Author: aliguori
Date: 2008-07-29 19:41:19 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
e1000: use common checksumming code
Signed-off-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
trunk/hw/e1000.c
Modified: trunk/hw/e1000.c
===================================================================
--- trunk/hw/e1000.c 2008-07-29 19:40:04 UTC (rev 4971)
+++ trunk/hw/e1000.c 2008-07-29 19:41:19 UTC (rev 4972)
@@ -279,26 +279,18 @@
E1000_EEPROM_RW_REG_DONE | r;
}
-static unsigned int
-do_cksum(uint8_t *dp, uint8_t *de)
-{
- unsigned int bsum[2] = {0, 0}, i, sum;
-
- for (i = 1; dp < de; bsum[i^=1] += *dp++)
- ;
- sum = (bsum[0] << 8) + bsum[1];
- sum = (sum >> 16) + (sum & 0xffff);
- return ~(sum + (sum >> 16));
-}
-
static void
putsum(uint8_t *data, uint32_t n, uint32_t sloc, uint32_t css, uint32_t cse)
{
+ uint32_t sum;
+
if (cse && cse < n)
n = cse + 1;
- if (sloc < n-1)
+ if (sloc < n-1) {
+ sum = net_checksum_add(n-css, data+css);
cpu_to_be16wu((uint16_t *)(data + sloc),
- do_cksum(data + css, data + n));
+ net_checksum_finish(sum));
+ }
}
static void
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [4972] e1000: use common checksumming code,
Anthony Liguori <=