* [PATCH net-next] Revert "ibmvnic: remove never executed if statement"
@ 2020-09-18 2:12 Lijun Pan
2020-09-18 21:08 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Lijun Pan @ 2020-09-18 2:12 UTC (permalink / raw)
To: netdev; +Cc: sukadev, drt, Lijun Pan
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>
---
drivers/net/ethernet/ibm/ibmvnic.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index e2a3c4bf00c9..6d320be47e60 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) {
--
2.23.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] Revert "ibmvnic: remove never executed if statement"
2020-09-18 2:12 [PATCH net-next] Revert "ibmvnic: remove never executed if statement" Lijun Pan
@ 2020-09-18 21:08 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-09-18 21:08 UTC (permalink / raw)
To: ljp; +Cc: netdev, sukadev, drt
From: Lijun Pan <ljp@linux.ibm.com>
Date: Thu, 17 Sep 2020 21:12:46 -0500
> 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>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-18 21:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-18 2:12 [PATCH net-next] Revert "ibmvnic: remove never executed if statement" Lijun Pan
2020-09-18 21:08 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).