From: Ivan Vecera Date: Tue, 10 Jul 2018 20:59:47 +0000 (+0200) Subject: be2net: re-order fields in be_error_recovert to avoid hole X-Git-Tag: v4.1.12-124.31.3~151 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=07fc6570025157d0c7b9992edd38f7f9e9c18045;p=users%2Fjedix%2Flinux-maple.git be2net: re-order fields in be_error_recovert to avoid hole Orabug: 29475071 - 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 Signed-off-by: David S. Miller Signed-off-by: Brian Maly Reviewed-by: John Donnelly Signed-off-by: Brian Maly --- diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h index 8f141f774446..26dec54b7dee 100644 --- a/drivers/net/ethernet/emulex/benet/be.h +++ b/drivers/net/ethernet/emulex/benet/be.h @@ -523,11 +523,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 */ @@ -535,7 +537,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;