svn commit: r299599 - in head/sys: dev/sfxge/common modules/sfxge

Andrew Rybchenko arybchik at FreeBSD.org
Fri May 13 06:59:22 UTC 2016


Author: arybchik
Date: Fri May 13 06:59:20 2016
New Revision: 299599
URL: https://svnweb.freebsd.org/changeset/base/299599

Log:
  sfxge(4): move ef10_mac_* to ef10_mac.c
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      1 week

Added:
  head/sys/dev/sfxge/common/ef10_mac.c
     - copied, changed from r299592, head/sys/dev/sfxge/common/hunt_mac.c
Deleted:
  head/sys/dev/sfxge/common/hunt_mac.c
Modified:
  head/sys/modules/sfxge/Makefile

Copied and modified: head/sys/dev/sfxge/common/ef10_mac.c (from r299592, head/sys/dev/sfxge/common/hunt_mac.c)
==============================================================================
--- head/sys/dev/sfxge/common/hunt_mac.c	Fri May 13 06:26:42 2016	(r299592, copy source)
+++ head/sys/dev/sfxge/common/ef10_mac.c	Fri May 13 06:59:20 2016	(r299599)
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
 #include "efx_impl.h"
 
 
-#if EFSYS_OPT_HUNTINGTON
+#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD
 
 	__checkReturn	efx_rc_t
 ef10_mac_poll(
@@ -749,4 +749,4 @@ ef10_mac_stats_update(
 
 #endif	/* EFSYS_OPT_MAC_STATS */
 
-#endif	/* EFSYS_OPT_HUNTINGTON */
+#endif	/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */

Modified: head/sys/modules/sfxge/Makefile
==============================================================================
--- head/sys/modules/sfxge/Makefile	Fri May 13 06:58:20 2016	(r299598)
+++ head/sys/modules/sfxge/Makefile	Fri May 13 06:59:20 2016	(r299599)
@@ -29,10 +29,10 @@ SRCS+=	siena_mac.c siena_mcdi.c siena_ni
 SRCS+=	siena_sram.c siena_vpd.c
 SRCS+=	siena_flash.h siena_impl.h
 
-SRCS+=	ef10_ev.c ef10_filter.c ef10_intr.c
+SRCS+=	ef10_ev.c ef10_filter.c ef10_intr.c ef10_mac.c
 SRCS+=	ef10_impl.h
 
-SRCS+=	hunt_mac.c hunt_mcdi.c hunt_nic.c
+SRCS+=	hunt_mcdi.c hunt_nic.c
 SRCS+=	hunt_nvram.c hunt_rx.c hunt_phy.c hunt_tx.c hunt_vpd.c
 SRCS+=	hunt_impl.h
 


More information about the svn-src-head mailing list