net: hns3: Fix for netdev not up problem when setting mtu
authorYunsheng Lin <linyunsheng@huawei.com>
Wed, 26 Sep 2018 18:28:37 +0000 (19:28 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Sep 2018 17:37:42 +0000 (10:37 -0700)
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>
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

index 3fc3822..545777a 100644 (file)
@@ -1491,13 +1491,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))