lkml.org 
[lkml]   [2019]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 019/220] net: hns3: Fix for netdev not up problem when setting mtu
    Date
    From: Yunsheng Lin <linyunsheng@huawei.com>

    [ Upstream commit 93d8daf460183871a965dae339839d9e35d44309 ]

    Currently hns3_nic_change_mtu will try to down the netdev before
    setting mtu, and it does not up the netdev when the setting fails,
    which causes netdev not up problem.

    This patch fixes it by not returning when the setting fails.

    Fixes: a8e8b7ff3517 ("net: hns3: Add support to change MTU in HNS3 hardware")
    Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
    Signed-off-by: Peng Li <lipeng321@huawei.com>
    Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 8 +++-----
    1 file changed, 3 insertions(+), 5 deletions(-)

    diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
    index 0ccfa6a845353..a5e3d38f18230 100644
    --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
    +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
    @@ -1447,13 +1447,11 @@ static int hns3_nic_change_mtu(struct net_device *netdev, int new_mtu)
    }

    ret = h->ae_algo->ops->set_mtu(h, new_mtu);
    - if (ret) {
    + if (ret)
    netdev_err(netdev, "failed to change MTU in hardware %d\n",
    ret);
    - return ret;
    - }
    -
    - netdev->mtu = new_mtu;
    + else
    + netdev->mtu = new_mtu;

    /* if the netdev was running earlier, bring it up again */
    if (if_running && hns3_nic_net_open(netdev))
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-22 12:13    [W:4.175 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site