Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 13 May 2016 07:08:33 +0000 (UTC)
From:      Andrew Rybchenko <arybchik@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r299605 - in head/sys: dev/sfxge/common modules/sfxge
Message-ID:  <201605130708.u4D78Xuh037196@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: arybchik
Date: Fri May 13 07:08:33 2016
New Revision: 299605
URL: https://svnweb.freebsd.org/changeset/base/299605

Log:
  sfxge(4): move ef10_tx_* to ef10_tx.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_tx.c
     - copied, changed from r299592, head/sys/dev/sfxge/common/hunt_tx.c
Deleted:
  head/sys/dev/sfxge/common/hunt_tx.c
Modified:
  head/sys/dev/sfxge/common/efx_tx.c
  head/sys/dev/sfxge/common/hunt_impl.h
  head/sys/modules/sfxge/Makefile

Copied and modified: head/sys/dev/sfxge/common/ef10_tx.c (from r299592, head/sys/dev/sfxge/common/hunt_tx.c)
==============================================================================
--- head/sys/dev/sfxge/common/hunt_tx.c	Fri May 13 06:26:42 2016	(r299592, copy source)
+++ head/sys/dev/sfxge/common/ef10_tx.c	Fri May 13 07:08:33 2016	(r299605)
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
 #include "efx_impl.h"
 
 
-#if EFSYS_OPT_HUNTINGTON
+#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD
 
 #if EFSYS_OPT_QSTATS
 #define	EFX_TX_QSTAT_INCR(_etp, _stat)					\
@@ -569,7 +569,7 @@ ef10_tx_qdesc_dma_create(
 }
 
 	void
-hunt_tx_qdesc_tso_create(
+ef10_tx_qdesc_tso_create(
 	__in	efx_txq_t *etp,
 	__in	uint16_t ipv4_id,
 	__in	uint32_t tcp_seq,
@@ -707,4 +707,4 @@ ef10_tx_qstats_update(
 
 #endif /* EFSYS_OPT_QSTATS */
 
-#endif /* EFSYS_OPT_HUNTINGTON */
+#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */

Modified: head/sys/dev/sfxge/common/efx_tx.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_tx.c	Fri May 13 07:06:57 2016	(r299604)
+++ head/sys/dev/sfxge/common/efx_tx.c	Fri May 13 07:08:33 2016	(r299605)
@@ -167,7 +167,7 @@ static const efx_tx_ops_t	__efx_tx_hunt_
 	ef10_tx_qpio_post,			/* etxo_qpio_post */
 	ef10_tx_qdesc_post,			/* etxo_qdesc_post */
 	ef10_tx_qdesc_dma_create,		/* etxo_qdesc_dma_create */
-	hunt_tx_qdesc_tso_create,		/* etxo_qdesc_tso_create */
+	ef10_tx_qdesc_tso_create,		/* etxo_qdesc_tso_create */
 	ef10_tx_qdesc_tso2_create,		/* etxo_qdesc_tso2_create */
 	ef10_tx_qdesc_vlantci_create,		/* etxo_qdesc_vlantci_create */
 #if EFSYS_OPT_QSTATS

Modified: head/sys/dev/sfxge/common/hunt_impl.h
==============================================================================
--- head/sys/dev/sfxge/common/hunt_impl.h	Fri May 13 07:06:57 2016	(r299604)
+++ head/sys/dev/sfxge/common/hunt_impl.h	Fri May 13 07:08:33 2016	(r299605)
@@ -746,7 +746,7 @@ ef10_tx_qdesc_dma_create(
 	__out	efx_desc_t *edp);
 
 extern	void
-hunt_tx_qdesc_tso_create(
+ef10_tx_qdesc_tso_create(
 	__in	efx_txq_t *etp,
 	__in	uint16_t ipv4_id,
 	__in	uint32_t tcp_seq,

Modified: head/sys/modules/sfxge/Makefile
==============================================================================
--- head/sys/modules/sfxge/Makefile	Fri May 13 07:06:57 2016	(r299604)
+++ head/sys/modules/sfxge/Makefile	Fri May 13 07:08:33 2016	(r299605)
@@ -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 ef10_rx.c
+SRCS+=	ef10_nvram.c ef10_phy.c ef10_rx.c ef10_tx.c
 SRCS+=	ef10_impl.h
 
 SRCS+=	hunt_nic.c
-SRCS+=	hunt_phy.c hunt_tx.c hunt_vpd.c
+SRCS+=	hunt_phy.c hunt_vpd.c
 SRCS+=	hunt_impl.h
 
 SRCS+=	medford_nic.c

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605130708.u4D78Xuh037196>