7573bb9b6f
Sync some patches from upstream about bugfix, modifies are as follow: - app/testpmd: fix crash in multi-process forwarding - net/hns3: fix offload flag of IEEE 1588 - net/hns3: fix read Rx timestamp handle - net/hns3: fix double free for Rx/Tx queue - net/hns3: fix variable overflow - net/hns3: enable PFC for all user priorities - ring: add telemetry command for ring info - ring: add telemetry command to list rings - net/hns3: support power monitor - net/hns3: disable SCTP verification tag for RSS hash input - app/testpmd: fix RSS algorithm choice
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From da365adce5e00a7dd7791e6ae7ed702de20af30c Mon Sep 17 00:00:00 2001
|
|
From: Dengdui Huang <huangdengdui@huawei.com>
|
|
Date: Wed, 3 Apr 2024 18:16:20 +0800
|
|
Subject: [PATCH 427/431] net/hns3: fix read Rx timestamp handle
|
|
|
|
[ upstream commit 0a96792880b7eb410f3c4ae4843d82df7005a627 ]
|
|
|
|
The flag RTE_MBUF_F_RX_IEEE1588_PTP depends on the packet
|
|
type and does not need to be set when reading Rx timestamp.
|
|
|
|
Fixes: 38b539d96eb6 ("net/hns3: support IEEE 1588 PTP")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Dengdui Huang <huangdengdui@huawei.com>
|
|
Signed-off-by: Jie Hai <haijie1@huawei.com>
|
|
Signed-off-by: chenyi <chenyi211@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_rxtx.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
|
|
index 0b8c59f4f9..2de31ab9a3 100644
|
|
--- a/drivers/net/hns3/hns3_rxtx.c
|
|
+++ b/drivers/net/hns3/hns3_rxtx.c
|
|
@@ -2401,8 +2401,7 @@ hns3_rx_ptp_timestamp_handle(struct hns3_rx_queue *rxq, struct rte_mbuf *mbuf,
|
|
{
|
|
struct hns3_pf *pf = HNS3_DEV_PRIVATE_TO_PF(rxq->hns);
|
|
|
|
- mbuf->ol_flags |= RTE_MBUF_F_RX_IEEE1588_PTP |
|
|
- RTE_MBUF_F_RX_IEEE1588_TMST;
|
|
+ mbuf->ol_flags |= RTE_MBUF_F_RX_IEEE1588_TMST;
|
|
if (hns3_timestamp_rx_dynflag > 0) {
|
|
*RTE_MBUF_DYNFIELD(mbuf, hns3_timestamp_dynfield_offset,
|
|
rte_mbuf_timestamp_t *) = timestamp;
|
|
--
|
|
2.33.0
|
|
|