From: Ivan Vecera <cera@cera.cz>
Date: Tue, 10 Jul 2018 20:59:44 +0000 (+0200)
Subject: be2net: reorder fields in be_eq_obj structure
X-Git-Tag: for-linus-4.19b-rc1b-tag~61^2~387^2~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e9c74cd85c00e46bff62d3bb2ce8c5fd02bf465e;p=users%2Fdwmw2%2Flinux.git

be2net: reorder fields in be_eq_obj structure

Re-order fields in struct be_eq_obj to ensure that .napi field begins
at start of cache-line. Also the .adapter field is moved to the first
cache-line next to .q field and 3 fields (idx,msi_idx,spurious_intr)
and the 4-bytes hole to 3rd cache-line.

Signed-off-by: Ivan Vecera <cera@cera.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index e71e5e5926266..716b4bc410f57 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -186,11 +186,11 @@ static inline void queue_tail_inc(struct be_queue_info *q)
 struct be_eq_obj {
 	struct be_queue_info q;
 
+	struct be_adapter *adapter;
+	struct napi_struct napi;
 	u8 idx;			/* array index */
 	u8 msix_idx;
 	u16 spurious_intr;
-	struct napi_struct napi;
-	struct be_adapter *adapter;
 	cpumask_var_t  affinity_mask;
 } ____cacheline_aligned_in_smp;