From: Ivan Vecera <cera@cera.cz>
Date: Fri, 19 Apr 2019 20:28:18 +0000 (-0400)
Subject: be2net: reorder fields in be_eq_obj structure
X-Git-Tag: v4.1.12-124.31.3~154
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9792fcd1e55a2235f1eb2ef706b2951e48a4159f;p=users%2Fjedix%2Flinux-maple.git

be2net: reorder fields in be_eq_obj structure

Orabug: 29475071

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>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Reviewed-by: John Donnelly <John.p.donnelly@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
---

diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index 9b976b750342..e5fc065117bc 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -187,11 +187,11 @@ struct be_eq_obj {
 	struct be_queue_info q;
 	char desc[32];
 
+	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;