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

Andrew Rybchenko arybchik at FreeBSD.org
Fri May 13 06:57:10 UTC 2016


Author: arybchik
Date: Fri May 13 06:57:08 2016
New Revision: 299597
URL: https://svnweb.freebsd.org/changeset/base/299597

Log:
  sfxge(4): move ef10_filter_* to ef10_filter.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_filter.c
     - copied, changed from r299595, head/sys/dev/sfxge/common/hunt_filter.c
Deleted:
  head/sys/dev/sfxge/common/hunt_filter.c
Modified:
  head/sys/modules/sfxge/Makefile

Copied and modified: head/sys/dev/sfxge/common/ef10_filter.c (from r299595, head/sys/dev/sfxge/common/hunt_filter.c)
==============================================================================
--- head/sys/dev/sfxge/common/hunt_filter.c	Fri May 13 06:47:47 2016	(r299595, copy source)
+++ head/sys/dev/sfxge/common/ef10_filter.c	Fri May 13 06:57:08 2016	(r299597)
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
 #include "efx.h"
 #include "efx_impl.h"
 
-#if EFSYS_OPT_HUNTINGTON
+#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD
 
 #if EFSYS_OPT_FILTER
 
@@ -1479,4 +1479,4 @@ ef10_filter_default_rxq_clear(
 
 #endif /* EFSYS_OPT_FILTER */
 
-#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:54:18 2016	(r299596)
+++ head/sys/modules/sfxge/Makefile	Fri May 13 06:57:08 2016	(r299597)
@@ -29,12 +29,11 @@ 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
+SRCS+=	ef10_ev.c ef10_filter.c
 SRCS+=	ef10_impl.h
 
 SRCS+=	hunt_intr.c hunt_mac.c hunt_mcdi.c hunt_nic.c
 SRCS+=	hunt_nvram.c hunt_rx.c hunt_phy.c hunt_tx.c hunt_vpd.c
-SRCS+=	hunt_filter.c
 SRCS+=	hunt_impl.h
 
 SRCS+=	medford_nic.c


More information about the svn-src-all mailing list