diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-21 13:39:34 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-21 13:39:34 -0800 |
| commit | e65ee2fb54d4745d7b7d9061d7fe33c5c5bf3b06 (patch) | |
| tree | 04b1728c397ad4604a6163529f51dfd48dfdbc07 /drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | |
| parent | b4d9785ce5c035b672f25df56706d0ff4e68b74e (diff) | |
| parent | 0c0ddd6ae47c9238c18f475bcca675ca74c9dc31 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflict resolution of ice_virtchnl_pf.c based upon work by
Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h index 656f1909b38f..36dad0eba3db 100644 --- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h @@ -33,7 +33,8 @@ #define ICE_MAX_POLICY_INTR_PER_VF 33 #define ICE_MIN_INTR_PER_VF (ICE_MIN_QS_PER_VF + 1) #define ICE_DFLT_INTR_PER_VF (ICE_DFLT_QS_PER_VF + 1) -#define ICE_MAX_VF_RESET_WAIT 15 +#define ICE_MAX_VF_RESET_TRIES 40 +#define ICE_MAX_VF_RESET_SLEEP_MS 20 #define ice_for_each_vf(pf, i) \ for ((i) = 0; (i) < (pf)->num_alloc_vfs; (i)++) |