OSDN Git Service

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)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 26 Mar 2019 20:40:20 +0000 (13:40 -0700)
commit5abac9d7e1bb9a373673811154774d4c89a7f85e
tree6480aff017861b8419c8d9a589eb246bf6b4572b
parentcf6c6e01bf5debe1d144bab6c8c903b926fa8882
ice: Put __ICE_PREPARED_FOR_RESET check in ice_prepare_for_reset

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>
drivers/net/ethernet/intel/ice/ice_main.c