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>
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 0e504e57af6c576202bbe1abe5a99eb24a981b73 Mon Sep 17 00:00:00 2001
|
|
From: Andre Mauricio Zelak <andre.zelak@windriver.com>
|
|
Date: Mon, 12 Jun 2023 17:51:10 -0300
|
|
Subject: [PATCH 32/48] phc2sys: Fix regression in the automatic mode.
|
|
|
|
Commit ac7d69bbc476 ("pmc_agent: Convert the method that queries the
|
|
port properties.") had the well meant intention of the cleaning up the
|
|
error code semantics of the port properties query function. However,
|
|
that commit mixed up the normal, external semantics of zero meaning
|
|
success with the internal semantics where zero is an error. Correct
|
|
the issue by replacing the hard coded number with the proper macro.
|
|
|
|
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
|
|
Fixes: ac7d69bbc476 ("pmc_agent: Convert the method that queries the port properties.")
|
|
|
|
[commit 0fb1be2f5c4d6905f33a2b1c31e7496d52296748 upstream]
|
|
Signed-off-by: Andre Mauricio Zelak <andre.zelak@windriver.com>
|
|
---
|
|
pmc_agent.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/pmc_agent.c b/pmc_agent.c
|
|
index 6e6627d..623f300 100644
|
|
--- a/pmc_agent.c
|
|
+++ b/pmc_agent.c
|
|
@@ -338,7 +338,7 @@ int pmc_agent_query_port_properties(struct pmc_agent *node, int timeout,
|
|
iface[len] = '\0';
|
|
|
|
msg_put(msg);
|
|
- res = 0;
|
|
+ res = RUN_PMC_OKAY;
|
|
break;
|
|
}
|
|
out:
|
|
--
|
|
2.25.1
|
|
|