linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Salil Mehta <salil.mehta@huawei.com>
To: <davem@davemloft.net>
Cc: <salil.mehta@huawei.com>, <yisen.zhuang@huawei.com>,
	<lipeng321@huawei.com>, <mehta.salil@opnsrc.net>,
	<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linuxarm@huawei.com>, Yunsheng Lin <linyunsheng@huawei.com>
Subject: [PATCH V2 net-next 07/10] net: hns3: Fix for netdev not up problem when setting mtu
Date: Sat, 29 Sep 2018 15:56:19 +0100	[thread overview]
Message-ID: <20180929145622.5448-8-salil.mehta@huawei.com> (raw)
In-Reply-To: <20180929145622.5448-1-salil.mehta@huawei.com>

From: Yunsheng Lin <linyunsheng@huawei.com>

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>
---
 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 3fc38228f459..545777ae2bc6 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -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))
-- 
2.11.0



  parent reply	other threads:[~2018-09-29 14:59 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-29 14:56 [PATCH V2 net-next 00/10] Cleanups, minor additions & fixes for HNS3 driver Salil Mehta
2018-09-29 14:56 ` [PATCH V2 net-next 01/10] net: hns3: Add support for sctp checksum offload Salil Mehta
2018-09-29 14:56 ` [PATCH V2 net-next 02/10] net: hns3: Set extra mac address of pause param for HW Salil Mehta
2018-09-29 14:56 ` [PATCH V2 net-next 03/10] net: hns3: Rename loop mode Salil Mehta
2018-09-29 14:56 ` [PATCH V2 net-next 04/10] net: hns3: Rename mac loopback to app loopback Salil Mehta
2018-09-29 14:56 ` [PATCH V2 net-next 05/10] net: hns3: Add serdes parallel inner loopback support Salil Mehta
2018-09-29 14:56 ` [PATCH V2 net-next 06/10] net: hns3: Fix for packet buffer setting bug Salil Mehta
2018-09-29 14:56 ` Salil Mehta [this message]
2018-09-29 14:56 ` [PATCH V2 net-next 08/10] net: hns3: Change return type of hclge_tm_schd_info_update() Salil Mehta
2018-09-29 14:56 ` [PATCH V2 net-next 09/10] net: hns3: Modify hns3_get_max_available_channels Salil Mehta
2018-09-29 14:56 ` [PATCH V2 net-next 10/10] net: hns3: Fix loss of coal configuration while doing reset Salil Mehta
2018-09-29 17:46 ` [PATCH V2 net-next 00/10] Cleanups, minor additions & fixes for HNS3 driver David Miller
2018-09-29 20:43   ` Salil Mehta

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180929145622.5448-8-salil.mehta@huawei.com \
    --to=salil.mehta@huawei.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxarm@huawei.com \
    --cc=linyunsheng@huawei.com \
    --cc=lipeng321@huawei.com \
    --cc=mehta.salil@opnsrc.net \
    --cc=netdev@vger.kernel.org \
    --cc=yisen.zhuang@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).