svn commit: r294380 - stable/10/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Wed Jan 20 07:50:00 2016
New Revision: 294380
URL: https://svnweb.freebsd.org/changeset/base/294380

Log:
  MFC r293890
  
  sfxge: rx_prefix_pktlen methods do not require EFSYS_OPT_RX_SCALE
  
  Submitted by:   Mark Spender <mspender at solarflare.com>
  Reviewed by:    gnn
  Sponsored by:   Solarflare Communications, Inc.

Modified:
  stable/10/sys/dev/sfxge/common/efx_rx.c
  stable/10/sys/dev/sfxge/common/hunt_impl.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/common/efx_rx.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_rx.c	Wed Jan 20 07:48:49 2016	(r294379)
+++ stable/10/sys/dev/sfxge/common/efx_rx.c	Wed Jan 20 07:50:00 2016	(r294380)
@@ -78,14 +78,14 @@ falconsiena_rx_prefix_hash(
 	__in		efx_rx_hash_alg_t func,
 	__in		uint8_t *buffer);
 
+#endif /* EFSYS_OPT_RX_SCALE */
+
 static	__checkReturn	efx_rc_t
 falconsiena_rx_prefix_pktlen(
 	__in		efx_nic_t *enp,
 	__in		uint8_t *buffer,
 	__out		uint16_t *lengthp);
 
-#endif /* EFSYS_OPT_RX_SCALE */
-
 static			void
 falconsiena_rx_qpost(
 	__in		efx_rxq_t *erp,

Modified: stable/10/sys/dev/sfxge/common/hunt_impl.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/hunt_impl.h	Wed Jan 20 07:48:49 2016	(r294379)
+++ stable/10/sys/dev/sfxge/common/hunt_impl.h	Wed Jan 20 07:50:00 2016	(r294380)
@@ -864,14 +864,14 @@ ef10_rx_prefix_hash(
 	__in		efx_rx_hash_alg_t func,
 	__in		uint8_t *buffer);
 
+#endif /* EFSYS_OPT_RX_SCALE */
+
 extern	__checkReturn	efx_rc_t
 ef10_rx_prefix_pktlen(
 	__in		efx_nic_t *enp,
 	__in		uint8_t *buffer,
 	__out		uint16_t *lengthp);
 
-#endif /* EFSYS_OPT_RX_SCALE */
-
 extern			void
 ef10_rx_qpost(
 	__in		efx_rxq_t *erp,