From e087672a4ccfbca0f5d1cac22e12f43fb3451030 Mon Sep 17 00:00:00 2001 From: arybchik Date: Thu, 14 Jan 2016 15:21:51 +0000 Subject: [PATCH] MFC r291925 sfxge: fix name conflict with crc32_table from sys/crc32.h The header is not present on FreeBSD, but exists on OmniOS where sfxge common code is used as well. Reviewed by: gnn Sponsored by: Solarflare Communications, Inc. --- sys/dev/sfxge/common/efx_crc32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/sfxge/common/efx_crc32.c b/sys/dev/sfxge/common/efx_crc32.c index 7e4cfc45133..1fb8b024a87 100644 --- a/sys/dev/sfxge/common/efx_crc32.c +++ b/sys/dev/sfxge/common/efx_crc32.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); * with polynomial 0x04c11db7 (bit-reversed 0xedb88320) */ -static const uint32_t crc32_table[256] = { +static const uint32_t efx_crc32_table[256] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, @@ -120,7 +120,7 @@ efx_crc32_calculate( for (index = 0; index < length; index++) { uint32_t data = *(input++); - crc = (crc >> 8) ^ crc32_table[(crc ^ data) & 0xff]; + crc = (crc >> 8) ^ efx_crc32_table[(crc ^ data) & 0xff]; } return (crc); -- 2.45.2