From a8d940d84b57ee3f7020cd93b840b5d7b50a74cb Mon Sep 17 00:00:00 2001
From: shenjian <shenjian15@huawei.com>
Date: Wed, 17 Jul 2019 17:25:04 +0800
Subject: [PATCH] net: hns3: fix set ring parameters error
driver inclusion
category: bugfix
bugzilla: NA
CVE: NA
The hns3_init_all_ring() has called outside the
hns3_change_all_ring_bd_num(), we should remove
it from hns3_change_all_ring_bd_num().
Feature or Bugfix:Bugfix
Signed-off-by: shenjian (K) <shenjian15@huawei.com>
Reviewed-by: lipeng <lipeng321@huawei.com>
Reviewed-by: Yunsheng Lin <linyunsheng@huawei.com>
Reviewed-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 2 +-
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h b/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h
index a4c040f1c959..d335d23b8baa 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h
@@ -48,7 +48,7 @@ enum HCLGE_MBX_OPCODE {
HCLGE_MBX_GET_VF_FLR_STATUS = 200, /* (M7 -> PF) get vf flr status */
HCLGE_MBX_PUSH_LINK_STATUS, /* (M7 -> PF) get port link status */
- HCLGE_MBX_NCSI_ERROR = 202, /* (M7 -> PF) receive a NCSI error */
+ HCLGE_MBX_NCSI_ERROR, /* (M7 -> PF) receive a NCSI error */
};
/* below are per-VF mac-vlan subcodes */
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
index a24e2aa140fe..49ef1fbde6ea 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
@@ -870,8 +870,8 @@ static int hns3_get_rxnfc(struct net_device *netdev,
}
}
-static int hns3_change_all_ring_bd_num(struct hns3_nic_priv *priv,
- u32 tx_desc_num, u32 rx_desc_num)
+static void hns3_change_all_ring_bd_num(struct hns3_nic_priv *priv,
+ u32 tx_desc_num, u32 rx_desc_num)
{
struct hnae3_handle *h = priv->ae_handle;
int i;
@@ -884,8 +884,6 @@ static int hns3_change_all_ring_bd_num(struct hns3_nic_priv *priv,
priv->ring_data[(u32)(i + h->kinfo.num_tqps)].ring->desc_num =
rx_desc_num;
}
-
- return hns3_init_all_ring(priv);
}
static struct hns3_enet_ring *hns3_backup_ringparam(struct hns3_nic_priv *priv)
--
GitLab