diff options
| author | Jacob Keller <jacob.e.keller@intel.com> | 2018-03-16 01:26:34 -0700 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2018-03-26 13:50:56 -0700 |
| commit | 5f76a704b8df9b4da898a230ac40d143eaca9cd8 (patch) | |
| tree | d592e5102b15f93011e51f6d6844981c97719e52 /drivers/net/ethernet/intel/i40e/i40e.h | |
| parent | 0605c45ce5f33a51e0b23e1d36f2e56db3c95f58 (diff) | |
i40e: move client flags into state bits
The iWarp client flags are all potentially changed when the RTNL lock is
not held, so they should not be part of the pf->flags variable. Instead,
move them into the state field so that we can use atomic bit operations.
This is part of a larger effort to remove cmpxchg64 in
i40e_set_priv_flags()
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/i40e/i40e.h')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h index 1ffe802d489f..67518013ca4d 100644 --- a/drivers/net/ethernet/intel/i40e/i40e.h +++ b/drivers/net/ethernet/intel/i40e/i40e.h @@ -167,6 +167,9 @@ enum i40e_state_t { __I40E_MACVLAN_SYNC_PENDING, __I40E_UDP_FILTER_SYNC_PENDING, __I40E_TEMP_LINK_POLLING, + __I40E_CLIENT_SERVICE_REQUESTED, + __I40E_CLIENT_L2_CHANGE, + __I40E_CLIENT_RESET, /* This must be last as it determines the size of the BITMAP */ __I40E_STATE_SIZE__, }; @@ -539,9 +542,7 @@ struct i40e_pf { #define I40E_FLAG_LEGACY_RX BIT_ULL(21) #define I40E_FLAG_PTP BIT_ULL(22) #define I40E_FLAG_IWARP_ENABLED BIT_ULL(23) -#define I40E_FLAG_SERVICE_CLIENT_REQUESTED BIT_ULL(24) -#define I40E_FLAG_CLIENT_L2_CHANGE BIT_ULL(25) -#define I40E_FLAG_CLIENT_RESET BIT_ULL(26) +/* Gap for BIT_ULL(24) through BIT_ULL(26) */ #define I40E_FLAG_LINK_DOWN_ON_CLOSE_ENABLED BIT_ULL(27) #define I40E_FLAG_SOURCE_PRUNING_DISABLED BIT_ULL(28) #define I40E_FLAG_TC_MQPRIO BIT_ULL(29) |