diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index 2733ecdeb0275ccab0b70e545e3533af346a0e16..ca347ae50b269360051548e9583fab5f38e3eb2f 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 d6e4caab5789bb37b5cb8565eba46bb0ed07b1bc..3a73063a7449dc54d8708313650d7b3b64bbff1d 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 fd573ef9700d90b3d711856ca6c7de0df6d9a752..a7b36e1318bd4f4a4f092986e26421b8d341667a 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)