svn commit: r342405 - stable/11/sys/dev/sfxge

[Andrew Rybchenko]

Author: arybchik
Date: Tue Dec 25 06:37:22 2018
New Revision: 342405
URL: https://svnweb.freebsd.org/changeset/base/342405

Log:
  MFC r312884
  
  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.
  
  Sponsored by:   Solarflare Communications, Inc.
  Differential Revision:  https://reviews.freebsd.org/D9359

Modified:
  stable/11/sys/dev/sfxge/sfxge_rx.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/sfxge/sfxge_rx.h
==============================================================================
--- stable/11/sys/dev/sfxge/sfxge_rx.h	Tue Dec 25 06:36:33 2018	(r342404)
+++ stable/11/sys/dev/sfxge/sfxge_rx.h	Tue Dec 25 06:37:22 2018	(r342405)
@@ -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);
 };
 
 /*