The clock code uses two different variables to store the TAI-UTC offset. One variable represents the compile time, configuration file, or command line initial UTC offset, while the other is used when taking on the GM role and is settable at run time. However, making this distinction makes no sense. This patch simplifies and clarifies the code by using a single variable for the offset.
Signed-off-by: Richard Cochran <[email protected]> --- clock.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/clock.c b/clock.c index da15882..aa1a5df 100644 --- a/clock.c +++ b/clock.c @@ -101,8 +101,7 @@ struct clock { int utc_offset_set; int leap_set; int kernel_leap; - int utc_offset; /* grand master role */ - int current_utc_offset; /* UTC offset fallback */ + int utc_offset; int time_flags; /* grand master role */ int time_source; /* grand master role */ enum servo_state servo_state; @@ -656,7 +655,7 @@ static void clock_update_slave(struct clock *c) if (!(c->tds.flags & PTP_TIMESCALE)) { pr_warning("foreign master not using PTP timescale"); } - if (c->tds.currentUtcOffset < c->current_utc_offset) { + if (c->tds.currentUtcOffset < c->utc_offset) { pr_warning("running in a temporal vortex"); } } @@ -672,10 +671,10 @@ static int clock_utc_correct(struct clock *c, tmv_t ingress) if (c->tds.flags & UTC_OFF_VALID && c->tds.flags & TIME_TRACEABLE) { utc_offset = c->tds.currentUtcOffset; - } else if (c->tds.currentUtcOffset > c->current_utc_offset) { + } else if (c->tds.currentUtcOffset > c->utc_offset) { utc_offset = c->tds.currentUtcOffset; } else { - utc_offset = c->current_utc_offset; + utc_offset = c->utc_offset; } if (c->tds.flags & LEAP_61) { @@ -992,7 +991,7 @@ struct clock *clock_create(enum clock_type type, struct config *config, c->freq_est_interval = config_get_int(config, NULL, "freq_est_interval"); c->grand_master_capable = config_get_int(config, NULL, "gmCapable"); c->kernel_leap = config_get_int(config, NULL, "kernel_leap"); - c->utc_offset = c->current_utc_offset = config_get_int(config, NULL, "utc_offset"); + c->utc_offset = config_get_int(config, NULL, "utc_offset"); c->time_source = config_get_int(config, NULL, "timeSource"); if (c->free_running) { -- 2.11.0 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Linuxptp-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxptp-devel
