svn commit: r312884 - head/sys/dev/sfxge

[Andrew Rybchenko]

Author: arybchik
Date: Fri Jan 27 11:57:19 2017
New Revision: 312884
URL: https://svnweb.freebsd.org/changeset/base/312884

Log:
  sfxge(4): fix RxQ structure layout vs usage on datapath
  
  Recent changes in the pseudo header accessor prototypes start to
  use common code RxQ handle on datapath. The handle was located
  at the end of the structure with members not used on datapath.
  
  Reviewed by:    philip
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      2 days
  Differential Revision:  https://reviews.freebsd.org/D9359

Modified:
  head/sys/dev/sfxge/sfxge_rx.h

Modified: head/sys/dev/sfxge/sfxge_rx.h
==============================================================================
--- head/sys/dev/sfxge/sfxge_rx.h	Fri Jan 27 11:56:18 2017	(r312883)
+++ head/sys/dev/sfxge/sfxge_rx.h	Fri Jan 27 11:57:19 2017	(r312884)
@@ -159,6 +159,7 @@ struct sfxge_rxq {
 	enum sfxge_rxq_state		init_state;
 	unsigned int			entries;
 	unsigned int			ptr_mask;
+	efx_rxq_t			*common;
 
 	struct sfxge_rx_sw_desc		*queue __aligned(CACHE_LINE_SIZE);
 	unsigned int			added;
@@ -173,8 +174,7 @@ struct sfxge_rxq {
 	struct callout			refill_callout;
 	unsigned int			refill_delay;
 
-	efx_rxq_t			*common __aligned(CACHE_LINE_SIZE);
-	volatile enum sfxge_flush_state	flush_state;
+	volatile enum sfxge_flush_state	flush_state __aligned(CACHE_LINE_SIZE);
 };
 
 /*