ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: move CRC32 calculation from compute_mcast_idx() into its own net_crc32() function 

Separate out the standard ethernet CRC32 calculation into a new net_crc32()
function, renaming the constant POLYNOMIAL to POLYNOMIAL_BE to make it clear
that this is a big-endian CRC32 calculation.

As part of the constant rename, remove the duplicate definition of POLYNOMIAL
from eepro100.c and use the new POLYNOMIAL_BE constant instead.

Once this is complete remove the existing CRC32 implementation from
compute_mcast_idx() and call the new net_crc32() function in its place.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Mark Cave-Ayland 2017-12-15 18:41:43 +00:00 committed by Jason Wang
parent d62644b46a
commit eaba8f34f0
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/net/eepro100.c
View File

@ -323,8 +323,6 @@ static const uint16_t eepro100_mdi_mask[] = {
0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
}; };
#define POLYNOMIAL 0x04c11db6
static E100PCIDeviceInfo *eepro100_get_class(EEPRO100State *s); static E100PCIDeviceInfo *eepro100_get_class(EEPRO100State *s);
/* From FreeBSD (locally modified). */ /* From FreeBSD (locally modified). */
@ -342,7 +340,7 @@ static unsigned e100_compute_mcast_idx(const uint8_t *ep)
crc <<= 1; crc <<= 1;
b >>= 1; b >>= 1;
if (carry) { if (carry) {
crc = ((crc ^ POLYNOMIAL) | carry); crc = ((crc ^ POLYNOMIAL_BE) | carry);
} }
} }
} }

3
include/net/net.h
View File

@ -227,7 +227,8 @@ NetClientState *net_hub_port_find(int hub_id);
void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd); void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);
#define POLYNOMIAL 0x04c11db6 #define POLYNOMIAL_BE 0x04c11db6
uint32_t net_crc32(const uint8_t *p, int len);
unsigned compute_mcast_idx(const uint8_t *ep); unsigned compute_mcast_idx(const uint8_t *ep);
#define vmstate_offset_macaddr(_state, _field) \ #define vmstate_offset_macaddr(_state, _field) \

16
net/net.c
View File

@ -1581,25 +1581,31 @@ int net_client_parse(QemuOptsList *opts_list, const char *optarg)
/* From FreeBSD */ /* From FreeBSD */
/* XXX: optimize */ /* XXX: optimize */
unsigned compute_mcast_idx(const uint8_t *ep) uint32_t net_crc32(const uint8_t *p, int len)
{ {
uint32_t crc; uint32_t crc;
int carry, i, j; int carry, i, j;
uint8_t b; uint8_t b;
crc = 0xffffffff; crc = 0xffffffff;
for (i = 0; i < 6; i++) { for (i = 0; i < len; i++) {
b = *ep++; b = *p++;
for (j = 0; j < 8; j++) { for (j = 0; j < 8; j++) {
carry = ((crc & 0x80000000L) ? 1 : 0) ^ (b & 0x01); carry = ((crc & 0x80000000L) ? 1 : 0) ^ (b & 0x01);
crc <<= 1; crc <<= 1;
b >>= 1; b >>= 1;
if (carry) { if (carry) {
crc = ((crc ^ POLYNOMIAL) | carry); crc = ((crc ^ POLYNOMIAL_BE) | carry);
} }
} }
} }
return crc >> 26;
return crc;
}
unsigned compute_mcast_idx(const uint8_t *ep)
{
return net_crc32(ep, ETH_ALEN) >> 26;
} }
QemuOptsList qemu_netdev_opts = { QemuOptsList qemu_netdev_opts = {