ESXi is required to transition back to a flat NVM from structured. Adding ifdef support for ESXi.
Signed-off-by: Doug Dziggel <douglas.a.dzig...@intel.com> Reviewed-by: Stillwell Jr Paul M <paul.m.stillwell...@intel.com> Reviewed-by: Williams Mitch A <mitch.a.willi...@intel.com> Reviewed-by: Kirsher Jeffrey T <jeffrey.t.kirs...@intel.com> Signed-off-by: Xiaolong Ye <xiaolong...@intel.com> --- drivers/net/i40e/base/i40e_common.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c index 68348858d..ed9ad011d 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -1017,10 +1017,10 @@ enum i40e_status_code i40e_init_shared_code(struct i40e_hw *hw) #ifdef I40E_NVMUPD_SUPPORT #ifndef EXTERNAL_RELEASE - /* At the moment there are only two OSes where this feature - * is required - FreeBSD and Linux. FreeBSD driver does + /* At the moment there are only three OSes where this feature + * is required - ESX, FreeBSD and Linux. FreeBSD driver does * not support transition to Flat NVM. Use preprocessor - * tag to ensure that this is exposed only for Linux. + * tag to ensure that this is exposed only for Linux and esx. */ #endif /* NVMUpdate features structure initialization */ @@ -1032,7 +1032,7 @@ enum i40e_status_code i40e_init_shared_code(struct i40e_hw *hw) sizeof(*hw->nvmupd_features.features), I40E_NONDMA_MEM); -#ifdef LINUX_SUPPORT +#if defined(LINUX_SUPPORT) || defined(ESX_SUPPORT) hw->nvmupd_features.features[0] = I40E_NVMUPD_FEATURE_FLAT_NVM_SUPPORT; #else /* No features supported at the moment */ -- 2.17.1