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 9b976b7503426251e9e1041c3cf2421b26f0f0aa..e5fc065117bcfb0a729b99c0711a32940f77618a 100644 (file)
--- 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;