[dpdk-stable] patch 'net/hns3: fix typos on comments' has been queued to stable release 19.11.9

Christian Ehrhardt christian.ehrhardt at canonical.com
Mon May 17 18:09:51 CEST 2021


Hi,

FYI, your patch has been queued to stable release 19.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/19/21. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/97441993c676db795e65c3d687584ac02ea62024

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 97441993c676db795e65c3d687584ac02ea62024 Mon Sep 17 00:00:00 2001
From: "Min Hu (Connor)" <humin29 at huawei.com>
Date: Fri, 23 Apr 2021 17:27:38 +0800
Subject: [PATCH] net/hns3: fix typos on comments

[ upstream commit db94014c4c6084d4797b514c6d0f517cdd546076 ]

This patch fixed wrong word in comments.

Fixes: f53a793bb7c2 ("net/hns3: add more hardware error types")
Fixes: d51867db65c1 ("net/hns3: add initialization")
Fixes: 411d23b9eafb ("net/hns3: support VLAN")
Fixes: 5f8845f4ba8f ("net/hns3: process MAC interrupt")

Signed-off-by: Min Hu (Connor) <humin29 at huawei.com>
---
 drivers/net/hns3/hns3_ethdev.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 83aaf961e2..c0620bf6a9 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -349,7 +349,7 @@ hns3_vlan_filter_configure(struct hns3_adapter *hns, uint16_t vlan_id, int on)
 	 * When port base vlan enabled, we use port base vlan as the vlan
 	 * filter condition. In this case, we don't update vlan filter table
 	 * when user add new vlan or remove exist vlan, just update the
-	 * vlan list. The vlan id in vlan list will be writen in vlan filter
+	 * vlan list. The vlan id in vlan list will be written in vlan filter
 	 * table until port base vlan disabled
 	 */
 	if (hw->port_base_vlan_cfg.state == HNS3_PORT_BASE_VLAN_DISABLE) {
@@ -3462,8 +3462,8 @@ hns3_rx_buffer_calc(struct hns3_hw *hw, struct hns3_pkt_buf_alloc *buf_alloc)
 	 * For different application scenes, the enabled port number, TC number
 	 * and no_drop TC number are different. In order to obtain the better
 	 * performance, software could allocate the buffer size and configure
-	 * the waterline by tring to decrease the private buffer size according
-	 * to the order, namely, waterline of valided tc, pfc disabled tc, pfc
+	 * the waterline by trying to decrease the private buffer size according
+	 * to the order, namely, waterline of valid tc, pfc disabled tc, pfc
 	 * enabled tc.
 	 */
 	if (hns3_rx_buf_calc_all(hw, false, buf_alloc))
-- 
2.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-17 17:40:35.748787321 +0200
+++ 0162-net-hns3-fix-typos-on-comments.patch	2021-05-17 17:40:29.455811713 +0200
@@ -1 +1 @@
-From db94014c4c6084d4797b514c6d0f517cdd546076 Mon Sep 17 00:00:00 2001
+From 97441993c676db795e65c3d687584ac02ea62024 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit db94014c4c6084d4797b514c6d0f517cdd546076 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -16,2 +17,2 @@
- drivers/net/hns3/hns3_ethdev.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ drivers/net/hns3/hns3_ethdev.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
@@ -20 +21 @@
-index bd0699af58..ab38eae127 100644
+index 83aaf961e2..c0620bf6a9 100644
@@ -23,10 +24 @@
-@@ -280,7 +280,7 @@ hns3_handle_mac_tnl(struct hns3_hw *hw)
- 	uint32_t status;
- 	int ret;
- 
--	/* query and clear mac tnl interruptions */
-+	/* query and clear mac tnl interrupt */
- 	hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_QUERY_MAC_TNL_INT, true);
- 	ret = hns3_cmd_send(hw, &desc, 1);
- 	if (ret) {
-@@ -462,7 +462,7 @@ hns3_vlan_filter_configure(struct hns3_adapter *hns, uint16_t vlan_id, int on)
+@@ -349,7 +349,7 @@ hns3_vlan_filter_configure(struct hns3_adapter *hns, uint16_t vlan_id, int on)
@@ -41 +33 @@
-@@ -3986,8 +3986,8 @@ hns3_rx_buffer_calc(struct hns3_hw *hw, struct hns3_pkt_buf_alloc *buf_alloc)
+@@ -3462,8 +3462,8 @@ hns3_rx_buffer_calc(struct hns3_hw *hw, struct hns3_pkt_buf_alloc *buf_alloc)
@@ -52,9 +43,0 @@
-@@ -5048,7 +5048,7 @@ hns3_config_all_msix_error(struct hns3_hw *hw, bool enable)
- 	 * and belong to a different type from the MSI-x errors processed
- 	 * by the network driver.
- 	 *
--	 * Network driver should open the new error report on initialition
-+	 * Network driver should open the new error report on initialization.
- 	 */
- 	val = hns3_read_dev(hw, HNS3_VECTOR0_OTER_EN_REG);
- 	hns3_set_bit(val, HNS3_VECTOR0_ALL_MSIX_ERR_B, enable ? 1 : 0);


More information about the stable mailing list