| Message ID | 1503065708-28277-5-git-send-email-mark.cave-ayland@ilande.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/18/2017 11:15 AM, Mark Cave-Ayland wrote: > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > --- > hw/net/eepro100.c | 19 +------------------ > 1 file changed, 1 insertion(+), 18 deletions(-) > > diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c > index 5a4774a..4226572 100644 > --- a/hw/net/eepro100.c > +++ b/hw/net/eepro100.c > @@ -327,26 +327,9 @@ static const uint16_t eepro100_mdi_mask[] = { > > static E100PCIDeviceInfo *eepro100_get_class(EEPRO100State *s); > > -/* From FreeBSD (locally modified). */ > static unsigned e100_compute_mcast_idx(const uint8_t *ep) > { > - uint32_t crc; > - int carry, i, j; > - uint8_t b; > - > - crc = 0xffffffff; > - for (i = 0; i < 6; i++) { > - b = *ep++; > - for (j = 0; j < 8; j++) { > - carry = ((crc & 0x80000000L) ? 1 : 0) ^ (b & 0x01); > - crc <<= 1; > - b >>= 1; > - if (carry) { > - crc = ((crc ^ POLYNOMIAL) | carry); > - } > - } > - } > - return (crc & BITS(7, 2)) >> 2; > + return (net_crc32(ep, 6) & BITS(7, 2)) >> 2; with previous suggestion from patch 1/4: return (mac_crc32_be(ep) & BITS(7, 2)) >> 2; then Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > } > > /* Read a 16 bit control/status (CSR) register. */ >
diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index 5a4774a..4226572 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -327,26 +327,9 @@ static const uint16_t eepro100_mdi_mask[] = { static E100PCIDeviceInfo *eepro100_get_class(EEPRO100State *s); -/* From FreeBSD (locally modified). */ static unsigned e100_compute_mcast_idx(const uint8_t *ep) { - uint32_t crc; - int carry, i, j; - uint8_t b; - - crc = 0xffffffff; - for (i = 0; i < 6; i++) { - b = *ep++; - for (j = 0; j < 8; j++) { - carry = ((crc & 0x80000000L) ? 1 : 0) ^ (b & 0x01); - crc <<= 1; - b >>= 1; - if (carry) { - crc = ((crc ^ POLYNOMIAL) | carry); - } - } - } - return (crc & BITS(7, 2)) >> 2; + return (net_crc32(ep, 6) & BITS(7, 2)) >> 2; } /* Read a 16 bit control/status (CSR) register. */
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> --- hw/net/eepro100.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)