From: shenhao <shenhao21@huawei.com> driver inclusion category: bugfix bugzilla: NA CVE: NA -------------------------------------------------- This patch modifies the location of definition of the macro HCLGE_LINK_STATUS_MS to synchronize code with kernel mainline. Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com> Signed-off-by: shenhao <shenhao21@huawei.com> Reviewed-by: Zhong Zhaohui <zhongzhaohui@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4 ++-- 1 file changed, 2 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 abbcf92..6087def6 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -40,8 +40,6 @@ #define HCLGE_PF_RESET_SYNC_TIME 20 #define HCLGE_PF_RESET_SYNC_CNT 1500 -#define HCLGE_LINK_STATUS_MS 10 - /* Get DFX BD number offset */ #define HCLGE_DFX_BIOS_BD_OFFSET 1 #define HCLGE_DFX_SSU_0_BD_OFFSET 2 @@ -56,6 +54,8 @@ #define HCLGE_DFX_TQP_BD_OFFSET 11 #define HCLGE_DFX_SSU_2_BD_OFFSET 12 +#define HCLGE_LINK_STATUS_MS 10 + #define HCLGE_VF_VPORT_START_NUM 1 static int hclge_set_mac_mtu(struct hclge_dev *hdev, int new_mps); -- 1.8.3