svn commit: r299323 - head/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Tue May 10 07:07:49 2016
New Revision: 299323
URL: https://svnweb.freebsd.org/changeset/base/299323

Log:
  sfxge(4): remove EFSYS_OPT_MAC_FALCON_XMAC
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      1 week

Modified:
  head/sys/dev/sfxge/common/efx_check.h
  head/sys/dev/sfxge/common/efx_mac.c
  head/sys/dev/sfxge/common/efx_phy.c

Modified: head/sys/dev/sfxge/common/efx_check.h
==============================================================================
--- head/sys/dev/sfxge/common/efx_check.h	Tue May 10 07:06:44 2016	(r299322)
+++ head/sys/dev/sfxge/common/efx_check.h	Tue May 10 07:07:49 2016	(r299323)
@@ -47,8 +47,6 @@
 # error "FALCON is obsolete and is not supported."
 #else
 /* FIXME: remove this after Falcon support has been removed */
-#define	EFSYS_OPT_MAC_FALCON_XMAC		(0)
-
 #define	EFSYS_OPT_MON_LM87			(0)
 #define	EFSYS_OPT_MON_MAX6647			(0)
 #define	EFSYS_OPT_MON_NULL			(0)
@@ -128,12 +126,9 @@
 # error "MAC_FALCON_GMAC is obsolete and is not supported."
 #endif
 
-/* Support Falcon XMAC */
-#if EFSYS_OPT_MAC_FALCON_XMAC
-# if !EFSYS_OPT_FALCON
-#  error "MAC_FALCON_XMAC requires FALCON"
-# endif
-#endif /* EFSYS_OPT_MAC_FALCON_XMAC */
+#ifdef EFSYS_OPT_MAC_FALCON_XMAC
+# error "MAC_FALCON_XMAC is obsolete and is not supported."
+#endif
 
 /* Support MAC statistics */
 #if EFSYS_OPT_MAC_STATS

Modified: head/sys/dev/sfxge/common/efx_mac.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_mac.c	Tue May 10 07:06:44 2016	(r299322)
+++ head/sys/dev/sfxge/common/efx_mac.c	Tue May 10 07:07:49 2016	(r299323)
@@ -34,10 +34,6 @@ __FBSDID("$FreeBSD$");
 #include "efx.h"
 #include "efx_impl.h"
 
-#if EFSYS_OPT_MAC_FALCON_XMAC
-#include "falcon_xmac.h"
-#endif
-
 #if EFSYS_OPT_SIENA
 
 static	__checkReturn	efx_rc_t
@@ -46,28 +42,6 @@ falconsiena_mac_multicast_list_set(
 
 #endif /* EFSYS_OPT_SIENA */
 
-#if EFSYS_OPT_MAC_FALCON_XMAC
-static efx_mac_ops_t	__efx_falcon_xmac_ops = {
-	falcon_xmac_reset,			/* emo_reset */
-	falcon_mac_poll,			/* emo_poll */
-	falcon_mac_up,				/* emo_up */
-	falcon_xmac_reconfigure,		/* emo_addr_set */
-	falcon_xmac_reconfigure,		/* emo_pdu_set */
-	falcon_xmac_reconfigure,		/* emo_reconfigure */
-	falconsiena_mac_multicast_list_set,	/* emo_multicast_list_set */
-	NULL,					/* emo_filter_set_default_rxq */
-	NULL,				/* emo_filter_default_rxq_clear */
-#if EFSYS_OPT_LOOPBACK
-	falcon_mac_loopback_set,		/* emo_loopback_set */
-#endif	/* EFSYS_OPT_LOOPBACK */
-#if EFSYS_OPT_MAC_STATS
-	falcon_mac_stats_upload,		/* emo_stats_upload */
-	NULL,					/* emo_stats_periodic */
-	falcon_xmac_stats_update		/* emo_stats_update */
-#endif	/* EFSYS_OPT_MAC_STATS */
-};
-#endif	/* EFSYS_OPT_MAC_FALCON_XMAC */
-
 #if EFSYS_OPT_SIENA
 static efx_mac_ops_t	__efx_siena_mac_ops = {
 	NULL,					/* emo_reset */
@@ -119,11 +93,7 @@ static efx_mac_ops_t	*__efx_mac_ops[] = 
 	/* [EFX_MAC_FALCON_GMAC] */
 	NULL,
 	/* [EFX_MAC_FALCON_XMAC] */
-#if EFSYS_OPT_MAC_FALCON_XMAC
-	&__efx_falcon_xmac_ops,
-#else
 	NULL,
-#endif
 	/* [EFX_MAC_SIENA] */
 #if EFSYS_OPT_SIENA
 	&__efx_siena_mac_ops,

Modified: head/sys/dev/sfxge/common/efx_phy.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_phy.c	Tue May 10 07:06:44 2016	(r299322)
+++ head/sys/dev/sfxge/common/efx_phy.c	Tue May 10 07:07:49 2016	(r299323)
@@ -33,9 +33,6 @@ __FBSDID("$FreeBSD$");
 
 #include "efx.h"
 #include "efx_impl.h"
-#if EFSYS_OPT_MAC_FALCON_XMAC
-#include "falcon_xmac.h"
-#endif
 
 #if EFSYS_OPT_PHY_NULL
 #include "nullphy.h"