Revert "ibmvnic: remove never executed if statement"
This reverts commit 550f4d46af
.
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 <ljp@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
5d7d28e5ff
commit
785a2b1036
1 changed files with 6 additions and 0 deletions
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue