From owner-svn-src-stable@freebsd.org  Thu Jan 14 15:21:52 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id ECABEA81D31;
 Thu, 14 Jan 2016 15:21:52 +0000 (UTC)
 (envelope-from arybchik@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B859219C7;
 Thu, 14 Jan 2016 15:21:52 +0000 (UTC)
 (envelope-from arybchik@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0EFLpKH042629;
 Thu, 14 Jan 2016 15:21:51 GMT (envelope-from arybchik@FreeBSD.org)
Received: (from arybchik@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0EFLph3042628;
 Thu, 14 Jan 2016 15:21:51 GMT (envelope-from arybchik@FreeBSD.org)
Message-Id: <201601141521.u0EFLph3042628@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: arybchik set sender to
 arybchik@FreeBSD.org using -f
From: Andrew Rybchenko <arybchik@FreeBSD.org>
Date: Thu, 14 Jan 2016 15:21:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r293956 - stable/10/sys/dev/sfxge/common
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jan 2016 15:21:53 -0000

Author: arybchik
Date: Thu Jan 14 15:21:51 2016
New Revision: 293956
URL: https://svnweb.freebsd.org/changeset/base/293956

Log:
  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.

Modified:
  stable/10/sys/dev/sfxge/common/efx_crc32.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/common/efx_crc32.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_crc32.c	Thu Jan 14 15:16:24 2016	(r293955)
+++ stable/10/sys/dev/sfxge/common/efx_crc32.c	Thu Jan 14 15:21:51 2016	(r293956)
@@ -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);