d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sfxge(4): remove EFSYS_OPT_MAC_FALCON_GMAC

Browse Source 
Submitted by:   Andy Moreton <amoreton at solarflare.com>
Sponsored by:   Solarflare Communications, Inc.
MFC after:      1 week
This commit is contained in:
arybchik 2016-05-10 07:06:44 +00:00
parent b13dfdf266
commit 4aaedc9a33
3 changed files with 3 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/sfxge/common/efx_check.h
View File

@ -47,7 +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_GMAC (0)
#define EFSYS_OPT_MAC_FALCON_XMAC (0)
#define EFSYS_OPT_MON_LM87 (0)
@ -125,12 +124,9 @@
# endif
#endif /* EFSYS_OPT_LOOPBACK */
/* Support Falcon GMAC */
#if EFSYS_OPT_MAC_FALCON_GMAC
# if !EFSYS_OPT_FALCON
# error "MAC_FALCON_GMAC requires FALCON"
# endif
#endif /* EFSYS_OPT_MAC_FALCON_GMAC */
#ifdef EFSYS_OPT_MAC_FALCON_GMAC
# error "MAC_FALCON_GMAC is obsolete and is not supported."
#endif
/* Support Falcon XMAC */
#if EFSYS_OPT_MAC_FALCON_XMAC

30
sys/dev/sfxge/common/efx_mac.c
View File

@ -34,10 +34,6 @@ __FBSDID("$FreeBSD$");
#include "efx.h"
#include "efx_impl.h"
#if EFSYS_OPT_MAC_FALCON_GMAC
#include "falcon_gmac.h"
#endif
#if EFSYS_OPT_MAC_FALCON_XMAC
#include "falcon_xmac.h"
#endif
@ -50,28 +46,6 @@ falconsiena_mac_multicast_list_set(
#endif /* EFSYS_OPT_SIENA */
#if EFSYS_OPT_MAC_FALCON_GMAC
static efx_mac_ops_t __efx_falcon_gmac_ops = {
falcon_gmac_reset, /* emo_reset */
falcon_mac_poll, /* emo_poll */
falcon_mac_up, /* emo_up */
falcon_gmac_reconfigure, /* emo_addr_set */
falcon_gmac_reconfigure, /* emo_pdu_set */
falcon_gmac_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_gmac_stats_update /* emo_stats_update */
#endif /* EFSYS_OPT_MAC_STATS */
};
#endif /* EFSYS_OPT_MAC_FALCON_GMAC */
#if EFSYS_OPT_MAC_FALCON_XMAC
static efx_mac_ops_t __efx_falcon_xmac_ops = {
falcon_xmac_reset, /* emo_reset */
@ -143,11 +117,7 @@ static efx_mac_ops_t *__efx_mac_ops[] = {
/* [EFX_MAC_INVALID] */
NULL,
/* [EFX_MAC_FALCON_GMAC] */
#if EFSYS_OPT_MAC_FALCON_GMAC
&__efx_falcon_gmac_ops,
#else
NULL,
#endif
/* [EFX_MAC_FALCON_XMAC] */
#if EFSYS_OPT_MAC_FALCON_XMAC
&__efx_falcon_xmac_ops,

4
sys/dev/sfxge/common/efx_phy.c
View File

@ -37,10 +37,6 @@ __FBSDID("$FreeBSD$");
#include "falcon_xmac.h"
#endif
#if EFSYS_OPT_MAC_FALCON_GMAC
#include "falcon_gmac.h"
#endif
#if EFSYS_OPT_PHY_NULL
#include "nullphy.h"
#endif