From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B8E04A2E1B for ; Thu, 5 Sep 2019 12:18:50 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AEB6D1EF99; Thu, 5 Sep 2019 12:18:50 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id E26CD1EF6F for ; Thu, 5 Sep 2019 12:18:48 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5B65430024DB; Thu, 5 Sep 2019 10:18:48 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 471A819C6A; Thu, 5 Sep 2019 10:18:47 +0000 (UTC) From: Kevin Traynor To: Harman Kalra Cc: Jerin Jacob , dpdk stable Date: Thu, 5 Sep 2019 11:17:21 +0100 Message-Id: <20190905101754.21933-21-ktraynor@redhat.com> In-Reply-To: <20190905101754.21933-1-ktraynor@redhat.com> References: <20190905101754.21933-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 05 Sep 2019 10:18:48 +0000 (UTC) Subject: [dpdk-stable] patch 'examples/ptpclient: fix delay request message' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/12/19. 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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/797ad03ba206449099ead390cb9a0bbb6f7361e9 Thanks. Kevin Traynor --- >From 797ad03ba206449099ead390cb9a0bbb6f7361e9 Mon Sep 17 00:00:00 2001 From: Harman Kalra Date: Thu, 25 Jul 2019 14:24:43 +0000 Subject: [PATCH] examples/ptpclient: fix delay request message [ upstream commit 376aa383e70ac3b66f4d7b6cc33d9971331a3915 ] Observed an issue with the length and domain number of the delay request message sent out by the client. Due to which delay response from master was not received. Fixes: ab129e9065a5 ("examples/ptpclient: add minimal PTP client") Signed-off-by: Harman Kalra Reviewed-by: Jerin Jacob --- examples/ptpclient/ptpclient.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c index 82ae71c19..89f19cadb 100644 --- a/examples/ptpclient/ptpclient.c +++ b/examples/ptpclient/ptpclient.c @@ -234,5 +234,9 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool) /* Enable timesync timestamping for the Ethernet device */ - rte_eth_timesync_enable(port); + retval = rte_eth_timesync_enable(port); + if (retval < 0) { + printf("Timesync enable failed: %d\n", retval); + return retval; + } /* Enable RX in promiscuous mode for the Ethernet device. */ @@ -414,4 +418,7 @@ parse_fup(struct ptpv2_data_slave_ordinary *ptp_data) ptp_msg->delay_req.hdr.control = 1; ptp_msg->delay_req.hdr.log_message_interval = 127; + ptp_msg->delay_req.hdr.message_length = + htons(sizeof(struct delay_req_msg)); + ptp_msg->delay_req.hdr.domain_number = ptp_hdr->domain_number; /* Set up clock id. */ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-09-05 10:36:48.809262245 +0100 +++ 0021-examples-ptpclient-fix-delay-request-message.patch 2019-09-05 10:36:47.516700379 +0100 @@ -1 +1 @@ -From 376aa383e70ac3b66f4d7b6cc33d9971331a3915 Mon Sep 17 00:00:00 2001 +From 797ad03ba206449099ead390cb9a0bbb6f7361e9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 376aa383e70ac3b66f4d7b6cc33d9971331a3915 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 95b0c176e..31778fd95 100644 +index 82ae71c19..89f19cadb 100644