| Message ID | 20210211014144.881861-1-sukadev@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/1] ibmvnic: Set to CLOSED state even on error | expand |
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Wed, 10 Feb 2021 17:41:43 -0800 you wrote: > 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: 01d9bd792d16 ("ibmvnic: Reorganize device close") > Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.ibm.com> > Reported-by: Abdul Haleem <abdhalee@in.ibm.com> > > [...] Here is the summary with links: - [1/1] ibmvnic: Set to CLOSED state even on error https://git.kernel.org/netdev/net/c/d4083d3c00f6 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 96c2b0985484..ce6b1cb0b0f9 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)
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: 01d9bd792d16 ("ibmvnic: Reorganize device close") Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.ibm.com> Reported-by: Abdul Haleem <abdhalee@in.ibm.com> --- drivers/net/ethernet/ibm/ibmvnic.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)