Date: Mon, 7 Dec 2015 06:05:23 +0000 (UTC) From: Andrew Rybchenko <arybchik@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291925 - head/sys/dev/sfxge/common Message-ID: <201512070605.tB765NQ5018308@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arybchik Date: Mon Dec 7 06:05:23 2015 New Revision: 291925 URL: https://svnweb.freebsd.org/changeset/base/291925 Log: 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. MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D4390 Modified: head/sys/dev/sfxge/common/efx_crc32.c Modified: head/sys/dev/sfxge/common/efx_crc32.c ============================================================================== --- head/sys/dev/sfxge/common/efx_crc32.c Mon Dec 7 06:04:24 2015 (r291924) +++ head/sys/dev/sfxge/common/efx_crc32.c Mon Dec 7 06:05:23 2015 (r291925) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512070605.tB765NQ5018308>