lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 054/340] ibmvnic: Set to CLOSED state even on error
    Date
    From: Sukadev Bhattiprolu <sukadev@linux.ibm.com>

    [ Upstream commit d4083d3c00f60a09ad82e3bf17ff57fec69c8aa6 ]

    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>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 0f35eec967ae8..5b5d488c2f374 100644
    --- a/drivers/net/ethernet/ibm/ibmvnic.c
    +++ b/drivers/net/ethernet/ibm/ibmvnic.c
    @@ -1254,10 +1254,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.27.0


    \
     
     \ /
      Last update: 2021-03-01 22:55    [W:4.031 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site