ibmvnic: complete init_done on transport events

[ Upstream commit 36491f2df9ad2501e5a4ec25d3d95d72bafd2781 ]

If we get a transport event, set the error and mark the init as
complete so the attempt to send crq-init or login fail sooner
rather than wait for the timeout.

Fixes: bbd669a868bb ("ibmvnic: Fix completion structure initialization")
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index de58824f4c18ce3cff5573d72c7f0cd649106e70..95bee3d915934242fe06bb30d650811dc08dae03 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -4923,6 +4923,13 @@ static void ibmvnic_handle_crq(union ibmvnic_crq *crq,
                        adapter->fw_done_rc = -EIO;
                        complete(&adapter->fw_done);
                }
+
+               /* if we got here during crq-init, retry crq-init */
+               if (!completion_done(&adapter->init_done)) {
+                       adapter->init_done_rc = -EAGAIN;
+                       complete(&adapter->init_done);
+               }
+
                if (!completion_done(&adapter->stats_done))
                        complete(&adapter->stats_done);
                if (test_bit(0, &adapter->resetting))