Commit d4083d3c authored by Sukadev Bhattiprolu's avatar Sukadev Bhattiprolu Committed by David S. Miller
Browse files

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. So set the adapter
to CLOSED state. That way if a new soft/hard reset is processed, the
adapter will remain in the CLOSED state until the next ibmvnic_open().

Fixes: 01d9bd79 ("ibmvnic: Reorganize device close")
Signed-off-by: default avatarSukadev Bhattiprolu <sukadev@linux.ibm.com>
Reported-by: default avatarAbdul Haleem <abdhalee@in.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d1be912

drivers/net/ethernet/ibm/ibmvnic.c

+1 −3
Original line number Diff line number Diff line
@@ -1353,10 +1353,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)