Revert "ibmvnic: remove never executed if statement"
PATCH 1/1 Revert "ibmvnic: remove never executed if statement"
This reverts commit 550f4d46aff6fe57c9b1c6719c3c9de2237d7ac2.
adapter->from_passive_init may be changed in ibmvnic_handle_crq while ibmvnic_reset_init is waiting for the completion of adapter->init_done.
Signed-off-by Lijun Pan <[email protected]>
--- drivers/net/ethernet/ibm/ibmvnic.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/ibm/ibmvnic.c +6 -0
@@ -5047,6 +5047,12 @@ static int ibmvnic_reset_init(struct ibmvnic_adapter *adapter, bool reset)return adapter->init_done_rc; } +if (adapter->from_passive_init) { + adapter->state =VNIC_OPEN ; + adapter->from_passive_init = false; +return -1 ; + } +if (reset &&test_bit (0 , &adapter->resetting) && !adapter->wait_for_reset && adapter->reset_reason !=VNIC_RESET_MOBILITY ) {
Signature · 1 line
2.23.0
From: Lijun Pan <[email protected]>
Date: Thu, 17 Sep 2020 21:12:46 -0500
Quoted 7 lines
This reverts commit
550f4d46aff6fe57c9b1c6719c3c9de2237d7ac2.
adapter->from_passive_initmay be changed inibmvnic_handle_crqwhileibmvnic_reset_initis waiting for the completion ofadapter->init_done.Signed-off-by Lijun Pan <[email protected]>
Applied.