svn commit: r293947 - stable/10/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Thu Jan 14 15:08:10 2016
New Revision: 293947
URL: https://svnweb.freebsd.org/changeset/base/293947

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

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

Modified: stable/10/sys/dev/sfxge/common/efx.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx.h	Thu Jan 14 15:07:02 2016	(r293946)
+++ stable/10/sys/dev/sfxge/common/efx.h	Thu Jan 14 15:08:10 2016	(r293947)
@@ -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: stable/10/sys/dev/sfxge/common/efx_nic.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_nic.c	Thu Jan 14 15:07:02 2016	(r293946)
+++ stable/10/sys/dev/sfxge/common/efx_nic.c	Thu Jan 14 15:08:10 2016	(r293947)
@@ -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