b707fdb119
Support multiple domain numbers for each uds socket used in HA phc2sys. The ha_domainNumber option is an interface setting to configure the domain number for an uds socket. It ranges from 0 to 127. If the ha_domainNumber is not configured for a given interface, the global domainNumber setting is used. Test plan: PASS: Verify use of ha_domainNumber configuration in manual configuration. Failure path: domain number match PASS: Verify that phc2sys fails to start if domain number doesn't match ptp4l instance parameter. Regression: PASS: Verify use of global domain number in manual configuration. PASS: Verify auto configuration uses global domain number. Story: 2010723 Task: 48656 Change-Id: If71775f6ce02586573f005c3b3e805b5351a5a86 Signed-off-by: Andre Mauricio Zelak <andre.zelak@windriver.com>
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
From 357e24c897e1e2d29cf011b3a38c3a6b2a7943c3 Mon Sep 17 00:00:00 2001
|
|
From: Andre Mauricio Zelak <andre.zelak@windriver.com>
|
|
Date: Mon, 12 Jun 2023 15:33:43 -0300
|
|
Subject: [PATCH 23/48] pmc_agent: Remove bogus comparison between last update
|
|
and now.
|
|
|
|
The monotonic clock can never go backwards. If you take T1 and later T2
|
|
from that clock, then (T2 > T1) is always true.
|
|
|
|
This patch removes the useless test.
|
|
|
|
[ This test evolved over the years. Originally the time stamp in question
|
|
came from a PHC. ]
|
|
|
|
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
|
|
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
|
|
|
|
[commit 2f2f7fc5881a88295350430edaf4505dc03b1602 upstream]
|
|
Signed-off-by: Andre Mauricio Zelak <andre.zelak@windriver.com>
|
|
---
|
|
pmc_agent.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/pmc_agent.c b/pmc_agent.c
|
|
index f30f174..df3a562 100644
|
|
--- a/pmc_agent.c
|
|
+++ b/pmc_agent.c
|
|
@@ -351,8 +351,7 @@ int update_pmc_node(struct pmc_agent *node)
|
|
}
|
|
ts = tp.tv_sec * NS_PER_SEC + tp.tv_nsec;
|
|
|
|
- if (!(ts > node->pmc_last_update &&
|
|
- ts - node->pmc_last_update < PMC_UPDATE_INTERVAL)) {
|
|
+ if (!(ts - node->pmc_last_update < PMC_UPDATE_INTERVAL)) {
|
|
if (node->stay_subscribed) {
|
|
renew_subscription(node, 0);
|
|
}
|
|
--
|
|
2.25.1
|
|
|