Signed-off-by: Richard Cochran <richardcoch...@gmail.com>
---
config.c | 7 +------
config.h | 2 --
ptp4l.c | 4 +---
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/config.c b/config.c
index ce3378a..9a240d7 100644
--- a/config.c
+++ b/config.c
@@ -80,6 +80,7 @@ struct config_item {
struct config_item config_tab[] = {
GLOB_ITEM_INT("assume_two_step", 0, 0, 1),
+ GLOB_ITEM_INT("check_fup_sync", 0, 0, 1),
GLOB_ITEM_INT("tx_timestamp_timeout", 1, 1, INT_MAX),
PORT_ITEM_INT("udp_ttl", 1, 1, 255),
};
@@ -529,12 +530,6 @@ static enum parser_result parse_global_setting(const char
*option,
cfg->dds.freq_est_interval = val;
pod->freq_est_interval = val;
- } else if (!strcmp(option, "check_fup_sync")) {
- r = get_ranged_int(value, &val, 0, 1);
- if (r != PARSED_OK)
- return r;
- *cfg->check_fup_sync = val;
-
} else if (!strcmp(option, "pi_proportional_const")) {
r = get_ranged_double(value, &df, 0.0, DBL_MAX);
if (r != PARSED_OK)
diff --git a/config.h b/config.h
index 3cd279c..1b9192d 100644
--- a/config.h
+++ b/config.h
@@ -70,8 +70,6 @@ struct config {
struct default_ds dds;
struct port_defaults pod;
- int *check_fup_sync;
-
enum servo_type clock_servo;
double *step_threshold;
diff --git a/ptp4l.c b/ptp4l.c
index f8972a6..4c6415b 100644
--- a/ptp4l.c
+++ b/ptp4l.c
@@ -101,9 +101,6 @@ static struct config cfg_settings = {
.timestamping = TS_HARDWARE,
.dm = DM_E2E,
.transport = TRANS_UDP_IPV4,
-
- .check_fup_sync = &sk_check_fupsync,
-
.clock_servo = CLOCK_SERVO_PI,
.step_threshold = &servo_step_threshold,
@@ -279,6 +276,7 @@ int main(int argc, char *argv[])
}
assume_two_step = config_get_int(&cfg_settings, NULL,
"assume_two_step");
+ sk_check_fupsync = config_get_int(&cfg_settings, NULL,
"check_fup_sync");
sk_tx_timeout = config_get_int(&cfg_settings, NULL,
"tx_timestamp_timeout");
if (!cfg_settings.dds.grand_master_capable &&
--
2.1.4
------------------------------------------------------------------------------
_______________________________________________
Linuxptp-devel mailing list
Linuxptp-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxptp-devel
