50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
From a4e5945057386872cb9add271aea76ca2413f481 Mon Sep 17 00:00:00 2001
|
|
From: Huazhong Tan <tanhuazhong@huawei.com>
|
|
Date: Mon, 31 Dec 2018 10:58:29 +0800
|
|
Subject: [PATCH 26/31] net: hns3: call hns3_nic_net_open() while doing
|
|
HNAE3_UP_CLIENT
|
|
Origin: https://git.kernel.org/linus/e888402789b9db5de4fcda361331d66dbf0cd9fd
|
|
|
|
For HNAE3_DOWN_CLIENT calling hns3_nic_net_stop(), HNAE3_UP_CLIENT
|
|
should call hns3_nic_net_open(), since if the number of queue or
|
|
the map of TC has is changed before HHAE3_UP_CLIENT is called,
|
|
it will cause problem.
|
|
|
|
Also the HNS3_NIC_STATE_RESETTING flag needs to be cleared before
|
|
hns3_nic_net_open() called, and set it back while hns3_nic_net_open()
|
|
failed.
|
|
|
|
Fixes: bb6b94a896d4 ("net: hns3: Add reset interface implementation in client")
|
|
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
|
|
Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
|
|
Signed-off-by: Peng Li <lipeng321@huawei.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
|
|
index 0ccfa6a84535..895c43fd1d81 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
|
|
@@ -3439,11 +3439,15 @@ static int hns3_reset_notify_down_enet(struct hnae3_handle *handle)
|
|
static int hns3_reset_notify_up_enet(struct hnae3_handle *handle)
|
|
{
|
|
struct hnae3_knic_private_info *kinfo = &handle->kinfo;
|
|
+ struct hns3_nic_priv *priv = netdev_priv(kinfo->netdev);
|
|
int ret = 0;
|
|
|
|
+ clear_bit(HNS3_NIC_STATE_RESETTING, &priv->state);
|
|
+
|
|
if (netif_running(kinfo->netdev)) {
|
|
- ret = hns3_nic_net_up(kinfo->netdev);
|
|
+ ret = hns3_nic_net_open(kinfo->netdev);
|
|
if (ret) {
|
|
+ set_bit(HNS3_NIC_STATE_RESETTING, &priv->state);
|
|
netdev_err(kinfo->netdev,
|
|
"hns net up fail, ret=%d!\n", ret);
|
|
return ret;
|
|
--
|
|
2.20.1
|
|
|