Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1566354

[patch] {1620} net: hns3: add dcb cap flag in init sequence

Show all headers | View raw

If enable DCB feature, we need to add the capacity, and the current
procedure cannot setting the dcb because of no capacity flag and every
ops interface will implement by the capicity flag is enable.

Signed-off-by: Kejian Yan <yankejian@huawei.com>
---
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 6 ++++--
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c   | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 26b9b46..fffe781 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -314,12 +314,14 @@ static int hclge_configure(struct hclge_dev *hdev)
 		hdev->tx_sch_mode = HCLGE_FLAG_TC_BASE_SCH_MODE;
 #ifdef CONFIG_HNS3_DCB
 		hdev->dcbx_cap = DCB_CAP_DCBX_VER_CEE |
-			DCB_CAP_DCBX_VER_IEEE;
+			DCB_CAP_DCBX_VER_IEEE | DCB_CAP_DCBX_HOST;
+		hdev->flag |= HCLGE_FLAG_DCB_CAPABLE;
 #endif /* #ifdef CONFIG_HNS3_DCB */
 	} else {
 		hdev->tx_sch_mode = HCLGE_FLAG_VNET_BASE_SCH_MODE;
 #ifdef CONFIG_HNS3_DCB
-		hdev->dcbx_cap = DCB_CAP_DCBX_VER_IEEE;
+		hdev->dcbx_cap = DCB_CAP_DCBX_VER_IEEE | DCB_CAP_DCBX_HOST;
+		hdev->flag |= HCLGE_FLAG_DCB_CAPABLE;
 #endif /* #ifdef CONFIG_HNS3_DCB */
 	}
 
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
index 903c413..6b00982 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
@@ -687,6 +687,11 @@ static void hclge_tm_tc_info_init(struct hclge_dev *hdev)
 	hdev->dcb_info_tmp.num_tc = hdev->dcb_info.num_tc;
 	memcpy(hdev->dcb_info_tmp.tc_info, hdev->dcb_info.tc_info,
 	       HNAE3_MAX_TC * sizeof(*hdev->dcb_info.tc_info));
+
+	if (hdev->dcb_info.num_tc > 1)
+		hdev->flag |= HCLGE_FLAG_DCB_ENABLE;
+	else
+		hdev->flag &= ~HCLGE_FLAG_DCB_ENABLE;
 }
 
 static void hclge_tm_pg_info_init(struct hclge_dev *hdev)
-- 
1.9.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[patch] {1620} net: hns3: add dcb cap flag in init sequence Kejian Yan <yankejian@huawei.com> - 2017-01-25 08:20 +0100
  Re: [patch] {1620} net: hns3: add dcb cap flag in init sequence "Yankejian (Hackim Yim)" <yankejian@huawei.com> - 2017-01-25 08:30 +0100
  Re: [patch] {1620} net: hns3: add dcb cap flag in init sequence David Miller <davem@davemloft.net> - 2017-01-25 17:30 +0100
    Re: [patch] {1620} net: hns3: add dcb cap flag in init sequence "Yankejian (Hackim Yim)" <yankejian@huawei.com> - 2017-01-26 04:40 +0100

csiph-web