From: Lijun Pan <ljp@linux.ibm.com>
Date: Fri, 18 Sep 2020 02:12:46 +0000 (-0500)
Subject: Revert "ibmvnic: remove never executed if statement"
X-Git-Tag: v5.10-rc1~107^2~227
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=785a2b1036273f6b7f78740cc4b0f32ffc9846f5;p=thirdparty%2Flinux.git

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 <ljp@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index e2a3c4bf00c98..6d320be47e600 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -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) {