From owner-svn-src-head@freebsd.org  Sat Dec  5 08:10:33 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 BFC1EA410A9;
 Sat,  5 Dec 2015 08:10:33 +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 7F5DF1810;
 Sat,  5 Dec 2015 08:10:33 +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 tB58AWoT077446;
 Sat, 5 Dec 2015 08:10:32 GMT (envelope-from arybchik@FreeBSD.org)
Received: (from arybchik@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB58AW8a077444;
 Sat, 5 Dec 2015 08:10:32 GMT (envelope-from arybchik@FreeBSD.org)
Message-Id: <201512050810.tB58AW8a077444@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: Sat, 5 Dec 2015 08:10:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291845 - head/sys/dev/sfxge/common
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Dec 2015 08:10:33 -0000

Author: arybchik
Date: Sat Dec  5 08:10:32 2015
New Revision: 291845
URL: https://svnweb.freebsd.org/changeset/base/291845

Log:
  sfxge: cleanup: remove SFL9122 "Huntington" PCI IDs
  
  The SFL9122 "Huntington" controller was never built.
  
  Submitted by:   Mark Spender <mspender at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      2 days

Modified:
  head/sys/dev/sfxge/common/efx.h
  head/sys/dev/sfxge/common/efx_nic.c

Modified: head/sys/dev/sfxge/common/efx.h
==============================================================================
--- head/sys/dev/sfxge/common/efx.h	Sat Dec  5 07:46:37 2015	(r291844)
+++ head/sys/dev/sfxge/common/efx.h	Sat Dec  5 08:10:32 2015	(r291845)
@@ -85,11 +85,9 @@ efx_infer_family(
 
 #define	EFX_PCI_DEVID_HUNTINGTON_PF_UNINIT	0x0901
 #define	EFX_PCI_DEVID_FARMINGDALE		0x0903	/* SFC9120 PF */
-#define	EFX_PCI_DEVID_HUNTINGTON		0x0913	/* SFL9122 PF */
 #define	EFX_PCI_DEVID_GREENPORT			0x0923	/* SFC9140 PF */
 
 #define	EFX_PCI_DEVID_FARMINGDALE_VF		0x1903	/* SFC9120 VF */
-#define	EFX_PCI_DEVID_HUNTINGTON_VF		0x1913	/* SFL9122 VF */
 #define	EFX_PCI_DEVID_GREENPORT_VF		0x1923	/* SFC9140 VF */
 
 

Modified: head/sys/dev/sfxge/common/efx_nic.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_nic.c	Sat Dec  5 07:46:37 2015	(r291844)
+++ head/sys/dev/sfxge/common/efx_nic.c	Sat Dec  5 08:10:32 2015	(r291845)
@@ -76,13 +76,11 @@ efx_family(
 
 		case EFX_PCI_DEVID_FARMINGDALE:
 		case EFX_PCI_DEVID_GREENPORT:
-		case EFX_PCI_DEVID_HUNTINGTON:
 			*efp = EFX_FAMILY_HUNTINGTON;
 			return (0);
 
 		case EFX_PCI_DEVID_FARMINGDALE_VF:
 		case EFX_PCI_DEVID_GREENPORT_VF:
-		case EFX_PCI_DEVID_HUNTINGTON_VF:
 			*efp = EFX_FAMILY_HUNTINGTON;
 			return (0);
 #endif