[PATCH net] ibmvnic: Set to CLOSED state even on error
From: Sukadev Bhattiprolu <hidden>
Date: 2021-02-10 07:16:28
Subsystem:
ibm power sriov virtual nic device driver, linux for powerpc (32-bit and 64-bit), networking drivers, the rest · Maintainers:
Haren Myneni, Rick Lindsley, Madhavan Srinivasan, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
From f6a04bc0abfae1065577888fc6467f9f162863f6 Mon Sep 17 00:00:00 2001 From: Sukadev Bhattiprolu <redacted> Date: Wed, 3 Feb 2021 13:15:23 -0800 Subject: [PATCH net] ibmvnic: Set to CLOSED state even on error If set_link_state() fails for any reason, we still cleanup the adapter state and cannot recover from a partial close anyway. Also, the reset functions do not check for the CLOSING state. So better to set adapter to CLOSED state. Found this while investigating a problem reported by Abdul Haleem. Signed-off-by: Sukadev Bhattiprolu <redacted> --- drivers/net/ethernet/ibm/ibmvnic.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index e51a7f2d00cb..1ec0dca80738 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c@@ -1367,10 +1367,8 @@ static int __ibmvnic_close(struct net_device *netdev) adapter->state = VNIC_CLOSING; rc = set_link_state(adapter, IBMVNIC_LOGICAL_LNK_DN); - if (rc) - return rc; adapter->state = VNIC_CLOSED; - return 0; + return rc; } static int ibmvnic_close(struct net_device *netdev)
--
2.26.2