chao
/
linuxptp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

phc2sys.c: Sync variable 'node.kernel_leap with cfg item 

Use struct config item 'kernel_leap' for parameter handling. Copy this to
node.kernel_leap afterwards. Check for 'servo_type' == CLOCK_SERVO_NTPSHM.

Signed-off-by: Peter Schneider <peter@psch.de>
master
Peter Schneider 2018-04-15 21:13:53 +02:00 committed by Richard Cochran
parent 41fa8e9d32
commit c22864a807
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phc2sys.c
View File

@ -1352,7 +1352,6 @@ int main(int argc, char *argv[])
.sanity_freq_limit = 200000000, .sanity_freq_limit = 200000000,
.phc_readings = 5, .phc_readings = 5,
.phc_interval = 1.0, .phc_interval = 1.0,
.kernel_leap = 1,
}; };
handle_term_signals(); handle_term_signals();
@ -1469,7 +1468,9 @@ int main(int argc, char *argv[])
} }
break; break;
case 'x': case 'x':
node.kernel_leap = 0; if (config_set_int(cfg, "kernel_leap", 0)) {
goto end;
}
break; break;
case 'z': case 'z':
if (strlen(optarg) > MAX_IFNAME_SIZE) { if (strlen(optarg) > MAX_IFNAME_SIZE) {
@ -1543,7 +1544,12 @@ int main(int argc, char *argv[])
print_set_verbose(config_get_int(cfg, NULL, "verbose")); print_set_verbose(config_get_int(cfg, NULL, "verbose"));
print_set_syslog(config_get_int(cfg, NULL, "use_syslog")); print_set_syslog(config_get_int(cfg, NULL, "use_syslog"));
print_set_level(config_get_int(cfg, NULL, "logging_level")); print_set_level(config_get_int(cfg, NULL, "logging_level"));
node.servo_type = config_get_int(cfg, NULL, "clock_servo"); node.servo_type = config_get_int(cfg, NULL, "clock_servo");
if (node.servo_type == CLOCK_SERVO_NTPSHM) {
config_set_int(cfg, "kernel_leap", 0);
}
node.kernel_leap = config_get_int(cfg, NULL, "kernel_leap");
if (autocfg) { if (autocfg) {
if (init_pmc(cfg, &node)) if (init_pmc(cfg, &node))