be2net: re-order fields in be_error_recovert to avoid hole

- Unionize two u8 fields where only one of them is used depending on NIC
chipset.
- Move recovery_supported field after that union

These changes eliminate 7-bytes hole in the struct and makes it smaller
by 8 bytes.

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

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index d521364e17cf..4f805be43180 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -522,11 +522,13 @@ enum {
 };
 
 struct be_error_recovery {
-        /* Lancer error recovery variables */
-        u8 recovery_retries;
+        union {
+                u8 recovery_retries;    /* used for Lancer              */
+                u8 recovery_state;      /* used for BEx and Skyhawk     */
+        };
 
         /* BEx/Skyhawk error recovery variables */
-        u8 recovery_state;
+        bool recovery_supported;
         u16 ue_to_reset_time;           /* Time after UE, to soft reset
                                          * the chip - PF0 only
                                          */
@@ -534,7 +536,6 @@ struct be_error_recovery {
                                          * of SLIPORT_SEMAPHORE reg
                                          */
         u16 last_err_code;
-        bool recovery_supported;
         unsigned long probe_time;
         unsigned long last_recovery_time;