| Message ID | 1485329200-64453-1-git-send-email-yankejian@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
it is misoperation, please ignore. sorry to interrupt you! On 2017/1/25 15:26, Kejian Yan wrote: > 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)
Networking patches must be sent to netdev@vger.kernel.org Thank you.
On 2017/1/26 0:24, David Miller wrote: > Networking patches must be sent to netdev@vger.kernel.org > > Thank you. > > . > it is misoperation, please ignore. sorry to interrupt you!
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)
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(-)