Commit 03d231a9 authored by Ivan Vecera's avatar Ivan Vecera Committed by David S. Miller

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: default avatarIvan Vecera <cera@cera.cz>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f9520b86
...@@ -522,11 +522,13 @@ enum { ...@@ -522,11 +522,13 @@ enum {
}; };
struct be_error_recovery { struct be_error_recovery {
/* Lancer error recovery variables */ union {
u8 recovery_retries; u8 recovery_retries; /* used for Lancer */
u8 recovery_state; /* used for BEx and Skyhawk */
};
/* BEx/Skyhawk error recovery variables */ /* BEx/Skyhawk error recovery variables */
u8 recovery_state; bool recovery_supported;
u16 ue_to_reset_time; /* Time after UE, to soft reset u16 ue_to_reset_time; /* Time after UE, to soft reset
* the chip - PF0 only * the chip - PF0 only
*/ */
...@@ -534,7 +536,6 @@ struct be_error_recovery { ...@@ -534,7 +536,6 @@ struct be_error_recovery {
* of SLIPORT_SEMAPHORE reg * of SLIPORT_SEMAPHORE reg
*/ */
u16 last_err_code; u16 last_err_code;
bool recovery_supported;
unsigned long probe_time; unsigned long probe_time;
unsigned long last_recovery_time; unsigned long last_recovery_time;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment