mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

e1000: use common checksumming code

Browse Source 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4972 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2008-07-29 19:41:19 +00:00
parent 48c643630c
commit c6a6a5e3bb
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/e1000.c
View File

@ -279,26 +279,18 @@ flash_eerd_read(E1000State *s, int x)
E1000_EEPROM_RW_REG_DONE | r; 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 static void
putsum(uint8_t *data, uint32_t n, uint32_t sloc, uint32_t css, uint32_t cse) putsum(uint8_t *data, uint32_t n, uint32_t sloc, uint32_t css, uint32_t cse)
{ {
uint32_t sum;
if (cse && cse < n) if (cse && cse < n)
n = cse + 1; 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), cpu_to_be16wu((uint16_t *)(data + sloc),
do_cksum(data + css, data + n)); net_checksum_finish(sum));
}
} }
static void static void