svn commit: r299604 - in head/sys: dev/sfxge/common modules/sfxge
Andrew Rybchenko
arybchik at FreeBSD.org
Fri May 13 07:06:58 UTC 2016
Author: arybchik
Date: Fri May 13 07:06:57 2016
New Revision: 299604
URL: https://svnweb.freebsd.org/changeset/base/299604
Log:
sfxge(4): move ef10_rx_* to ef10_rx.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_rx.c
- copied, changed from r299592, head/sys/dev/sfxge/common/hunt_rx.c
Deleted:
head/sys/dev/sfxge/common/hunt_rx.c
Modified:
head/sys/modules/sfxge/Makefile
Copied and modified: head/sys/dev/sfxge/common/ef10_rx.c (from r299592, head/sys/dev/sfxge/common/hunt_rx.c)
==============================================================================
--- head/sys/dev/sfxge/common/hunt_rx.c Fri May 13 06:26:42 2016 (r299592, copy source)
+++ head/sys/dev/sfxge/common/ef10_rx.c Fri May 13 07:06:57 2016 (r299604)
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
#include "efx_impl.h"
-#if EFSYS_OPT_HUNTINGTON
+#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD
static __checkReturn efx_rc_t
@@ -823,4 +823,4 @@ ef10_rx_fini(
#endif /* EFSYS_OPT_RX_SCALE */
}
-#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 07:05:40 2016 (r299603)
+++ head/sys/modules/sfxge/Makefile Fri May 13 07:06:57 2016 (r299604)
@@ -30,11 +30,11 @@ SRCS+= siena_sram.c siena_vpd.c
SRCS+= siena_flash.h siena_impl.h
SRCS+= ef10_ev.c ef10_filter.c ef10_intr.c ef10_mac.c ef10_mcdi.c ef10_nic.c
-SRCS+= ef10_nvram.c ef10_phy.c
+SRCS+= ef10_nvram.c ef10_phy.c ef10_rx.c
SRCS+= ef10_impl.h
SRCS+= hunt_nic.c
-SRCS+= hunt_rx.c hunt_phy.c hunt_tx.c hunt_vpd.c
+SRCS+= hunt_phy.c hunt_tx.c hunt_vpd.c
SRCS+= hunt_impl.h
SRCS+= medford_nic.c
More information about the svn-src-head
mailing list