Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd12b061 authored by Lev Faerman's avatar Lev Faerman Committed by Greg Kroah-Hartman
Browse files

ice: Fix NVM mask defines 



[ Upstream commit 6263e811f4d4418660c20b36a08063c6d2c3fb9d ]

Fixes bad masks that would break compilation when evaluated.

Signed-off-by: default avatarLev Faerman <lev.faerman@intel.com>
Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ac3750e9

drivers/net/ethernet/intel/ice/ice_adminq_cmd.h

+3 −3
Original line number Diff line number Diff line
@@ -1056,10 +1056,10 @@ struct ice_aqc_nvm { 
#define ICE_AQC_NVM_LAST_CMD		BIT(0)

#define ICE_AQC_NVM_PCIR_REQ		BIT(0)	/* Used by NVM Update reply */

#define ICE_AQC_NVM_PRESERVATION_S	1

#define ICE_AQC_NVM_PRESERVATION_M	(3 << CSR_AQ_NVM_PRESERVATION_S)

#define ICE_AQC_NVM_NO_PRESERVATION	(0 << CSR_AQ_NVM_PRESERVATION_S)

#define ICE_AQC_NVM_PRESERVATION_M	(3 << ICE_AQC_NVM_PRESERVATION_S)

#define ICE_AQC_NVM_NO_PRESERVATION	(0 << ICE_AQC_NVM_PRESERVATION_S)

#define ICE_AQC_NVM_PRESERVE_ALL	BIT(1)

#define ICE_AQC_NVM_PRESERVE_SELECTED	(3 << CSR_AQ_NVM_PRESERVATION_S)

#define ICE_AQC_NVM_PRESERVE_SELECTED	(3 << ICE_AQC_NVM_PRESERVATION_S)

#define ICE_AQC_NVM_FLASH_ONLY		BIT(7)

	__le16 module_typeid;

	__le16 length;