Signed-off-by: Richard Cochran <richardcoch...@gmail.com>
---
config.c | 9 ++-------
ds.h | 1 -
port.c | 2 +-
ptp4l.c | 1 -
4 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/config.c b/config.c
index 0cd26e2..56a86e9 100644
--- a/config.c
+++ b/config.c
@@ -96,6 +96,7 @@ struct config_item config_tab[] = {
PORT_ITEM_INT("delayAsymmetry", 0, INT_MIN, INT_MAX),
GLOB_ITEM_DBL("first_step_threshold", 0.00002, 0.0, DBL_MAX),
PORT_ITEM_INT("logAnnounceInterval", 1, INT8_MIN, INT8_MAX),
+ PORT_ITEM_INT("logMinDelayReqInterval", 0, INT8_MIN, INT8_MAX),
PORT_ITEM_INT("logSyncInterval", 0, INT8_MIN, INT8_MAX),
GLOB_ITEM_INT("logging_level", LOG_INFO, PRINT_LEVEL_MIN,
PRINT_LEVEL_MAX),
GLOB_ITEM_INT("max_frequency", 900000000, 0, INT_MAX),
@@ -265,13 +266,7 @@ static enum parser_result parse_pod_setting(const char
*option,
enum parser_result r;
- if (!strcmp(option, "logMinDelayReqInterval")) {
- r = get_ranged_int(value, &val, INT8_MIN, INT8_MAX);
- if (r != PARSED_OK)
- return r;
- pod->logMinDelayReqInterval = val;
-
- } else if (!strcmp(option, "logMinPdelayReqInterval")) {
+ if (!strcmp(option, "logMinPdelayReqInterval")) {
r = get_ranged_int(value, &val, INT8_MIN, INT8_MAX);
if (r != PARSED_OK)
return r;
diff --git a/ds.h b/ds.h
index 58451d8..f83490b 100644
--- a/ds.h
+++ b/ds.h
@@ -125,7 +125,6 @@ struct portDS {
#define FRI_ASAP (-128)
struct port_defaults {
- Integer8 logMinDelayReqInterval;
Integer8 logMinPdelayReqInterval;
UInteger8 announceReceiptTimeout;
UInteger8 syncReceiptTimeout;
diff --git a/port.c b/port.c
index a941cb7..00e654e 100644
--- a/port.c
+++ b/port.c
@@ -1444,7 +1444,7 @@ static int port_initialize(struct port *p)
p->multiple_seq_pdr_count = 0;
p->multiple_pdr_detected = 0;
p->last_fault_type = FT_UNSPECIFIED;
- p->logMinDelayReqInterval = p->pod.logMinDelayReqInterval;
+ p->logMinDelayReqInterval = config_get_int(cfg, p->name,
"logMinDelayReqInterval");
p->peerMeanPathDelay = 0;
p->logAnnounceInterval = config_get_int(cfg, p->name,
"logAnnounceInterval");
p->announceReceiptTimeout = p->pod.announceReceiptTimeout;
diff --git a/ptp4l.c b/ptp4l.c
index 911baca..2b58b13 100644
--- a/ptp4l.c
+++ b/ptp4l.c
@@ -80,7 +80,6 @@ static struct config cfg_settings = {
},
.pod = {
- .logMinDelayReqInterval = 0,
.logMinPdelayReqInterval = 0,
.announceReceiptTimeout = 3,
.syncReceiptTimeout = 0,
--
2.1.4
------------------------------------------------------------------------------
_______________________________________________
Linuxptp-devel mailing list
Linuxptp-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxptp-devel
