Sync some patchs from upstreaming for hns3 pmd and modifies are as follow: 1. fix RTC time after reset 2. fix Rx ring mbuf leakage at reset process 3. fix uninitialized variable 4. modify the code that violates the coding standards (cherry picked from commit f98940e02a12dc752a60e786009ee44cb6b32132)
72 lines
2.4 KiB
Diff
72 lines
2.4 KiB
Diff
From acc1ca225b8618728abd2b971f55354a7f6eebcf Mon Sep 17 00:00:00 2001
|
|
From: Dengdui Huang <huangdengdui@huawei.com>
|
|
Date: Fri, 2 Jun 2023 19:42:05 +0800
|
|
Subject: net/hns3: fix redundant line break in log
|
|
|
|
[ upstream commit 1af035107a4da0c5ea528afbde5d3d6ccc016437 ]
|
|
|
|
This patch remove log redundant line break
|
|
|
|
Fixes: d51867db65c1 ("net/hns3: add initialization")
|
|
Fixes: c6332c3cf9f0 ("net/hns3: support module EEPROM dump")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Dengdui Huang <huangdengdui@huawei.com>
|
|
Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_ethdev.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
|
|
index d7443e197c..9af08a7748 100644
|
|
--- a/drivers/net/hns3/hns3_ethdev.c
|
|
+++ b/drivers/net/hns3/hns3_ethdev.c
|
|
@@ -3631,7 +3631,7 @@ hns3_get_mac_ethertype_cmd_status(uint16_t cmdq_resp, uint8_t resp_code)
|
|
|
|
if (cmdq_resp) {
|
|
PMD_INIT_LOG(ERR,
|
|
- "cmdq execute failed for get_mac_ethertype_cmd_status, status=%u.\n",
|
|
+ "cmdq execute failed for get_mac_ethertype_cmd_status, status=%u.",
|
|
cmdq_resp);
|
|
return -EIO;
|
|
}
|
|
@@ -6235,7 +6235,7 @@ hns3_optical_module_existed(struct hns3_hw *hw)
|
|
ret = hns3_cmd_send(hw, &desc, 1);
|
|
if (ret) {
|
|
hns3_err(hw,
|
|
- "fail to get optical module exist state, ret = %d.\n",
|
|
+ "fail to get optical module exist state, ret = %d.",
|
|
ret);
|
|
return false;
|
|
}
|
|
@@ -6273,7 +6273,7 @@ hns3_get_module_eeprom_data(struct hns3_hw *hw, uint32_t offset,
|
|
|
|
ret = hns3_cmd_send(hw, desc, HNS3_SFP_INFO_CMD_NUM);
|
|
if (ret) {
|
|
- hns3_err(hw, "fail to get module EEPROM info, ret = %d.\n",
|
|
+ hns3_err(hw, "fail to get module EEPROM info, ret = %d.",
|
|
ret);
|
|
return ret;
|
|
}
|
|
@@ -6310,7 +6310,7 @@ hns3_get_module_eeprom(struct rte_eth_dev *dev,
|
|
return -ENOTSUP;
|
|
|
|
if (!hns3_optical_module_existed(hw)) {
|
|
- hns3_err(hw, "fail to read module EEPROM: no module is connected.\n");
|
|
+ hns3_err(hw, "fail to read module EEPROM: no module is connected.");
|
|
return -EIO;
|
|
}
|
|
|
|
@@ -6373,7 +6373,7 @@ hns3_get_module_info(struct rte_eth_dev *dev,
|
|
modinfo->eeprom_len = RTE_ETH_MODULE_SFF_8636_MAX_LEN;
|
|
break;
|
|
default:
|
|
- hns3_err(hw, "unknown module, type = %u, extra_type = %u.\n",
|
|
+ hns3_err(hw, "unknown module, type = %u, extra_type = %u.",
|
|
sfp_type.type, sfp_type.ext_type);
|
|
return -EINVAL;
|
|
}
|
|
--
|
|
2.23.0
|
|
|