]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
ice: Put __ICE_PREPARED_FOR_RESET check in ice_prepare_for_reset
authorBrett Creeley <brett.creeley@intel.com>
Wed, 13 Feb 2019 18:51:14 +0000 (10:51 -0800)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 13 Aug 2019 12:11:36 +0000 (14:11 +0200)
commita032dcba1f5c379acca42a10d0588f86e0b38f20
tree0ab84b8d7f1baf6e7f863cd95bd56f63943c3849
parentc7aac8ed133311c55caf684a8c669077124c43b3
ice: Put __ICE_PREPARED_FOR_RESET check in ice_prepare_for_reset

BugLink: https://bugs.launchpad.net/bugs/1837517
[ Upstream commit 5abac9d7e1bb9a373673811154774d4c89a7f85e ]

Currently we check if the __ICE_PREPARED_FOR_RESET bit is set prior to
calling ice_prepare_for_reset in ice_reset_subtask(), but we aren't
checking that bit in ice_do_reset() before calling
ice_prepare_for_reset(). This is not consistent and can cause issues if
ice_prepare_for_reset() is called prior to ice_do_reset(). Fix this by
checking if the __ICE_PREPARED_FOR_RESET bit is set internal to
ice_prepare_for_reset().

Signed-off-by: Brett Creeley <brett.creeley@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/net/ethernet/intel/ice/ice_main.c