From e15f16dfd0b696f273b064086df62c26c57ec6cb Mon Sep 17 00:00:00 2001 From: liaoguojia Date: Fri, 12 Jul 2019 14:47:22 +0800 Subject: [PATCH] net: hns3: Fix the parameter name of max which should be min driver inclusion category: bugfix bugzilla: NA CVE: NA Code original meaning to get the min value of two input parameters, but named as max.Now fix this parameter name. Patch checking found there were two multple blank lines, so fix it in this patch. Feature or Bugfix:Bugfix Signed-off-by: liaoguojia Reviewed-by: lipeng Reviewed-by: Yang Yingliang Signed-off-by: Yang Yingliang --- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 1 - drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 1 - drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 6 +++--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index 2733ecdeb027..ca347ae50b26 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -1070,7 +1070,6 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv, vflags.inner_vtag = 0; vflags.out_vtag = 0; - ret = hns3_fill_desc_vtags(skb, ring, &vflags); return ret; diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h index d6e4caab5789..3a73063a7449 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h @@ -927,7 +927,6 @@ struct hclge_dbg_reg_common_msg { enum hclge_opcode_type cmd; }; - #define HCLGE_DEFAULT_TX_BUF 0x4000 /* 16k bytes */ #define HCLGE_TOTAL_PKT_BUF 0x108000 /* 1.03125M bytes */ #define HCLGE_DEFAULT_DV 0xA000 /* 40k byte */ diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c index fd573ef9700d..a7b36e1318bd 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c @@ -63,7 +63,7 @@ static void hclge_dbg_dump_reg_common(struct hclge_dev *hdev, int bd_num, buf_len; int ret, i; int index; - int max; + int min_num; ret = kstrtouint(cmd_buf, 0, &index); index = (ret != 0) ? 0 : index; @@ -91,10 +91,10 @@ static void hclge_dbg_dump_reg_common(struct hclge_dev *hdev, entries_per_desc = ARRAY_SIZE(desc->data); - max = (bd_num * entries_per_desc, reg_msg->msg_num); + min_num = min(bd_num * entries_per_desc, reg_msg->msg_num); desc = desc_src; - for (i = 0; i < max; i++) { + for (i = 0; i < min_num; i++) { if (i > 0 && (i % entries_per_desc) == 0) desc++; if (dfx_message->flag) -- GitLab