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

Fix port numbering in clock log messages. 

Add 1 to port numbers printed in the log messages to make them
consistent with messages from port.c. The port number 0 is the UDS port,
which is last in the clock->port array.

Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
master
Miroslav Lichvar 2013-08-21 12:57:05 +02:00 committed by Richard Cochran
parent 011ba7b455
commit ad1b14e126
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clock.c
View File

@ -132,7 +132,7 @@ static int clock_fault_timeout(struct clock *c, int index, int set)
struct fault_interval i; struct fault_interval i;
if (!set) { if (!set) {
pr_debug("clearing fault on port %d", index); pr_debug("clearing fault on port %d", index + 1);
return set_tmo_lin(c->fault_fd[index], 0); return set_tmo_lin(c->fault_fd[index], 0);
} }
@ -140,11 +140,11 @@ static int clock_fault_timeout(struct clock *c, int index, int set)
if (i.type == FTMO_LINEAR_SECONDS) { if (i.type == FTMO_LINEAR_SECONDS) {
pr_debug("waiting %d seconds to clear fault on port %d", pr_debug("waiting %d seconds to clear fault on port %d",
i.val, index); i.val, index + 1);
return set_tmo_lin(c->fault_fd[index], i.val); return set_tmo_lin(c->fault_fd[index], i.val);
} else if (i.type == FTMO_LOG2_SECONDS) { } else if (i.type == FTMO_LOG2_SECONDS) {
pr_debug("waiting 2^{%d} seconds to clear fault on port %d", pr_debug("waiting 2^{%d} seconds to clear fault on port %d",
i.val, index); i.val, index + 1);
return set_tmo_log(c->fault_fd[index], 1, i.val); return set_tmo_log(c->fault_fd[index], 1, i.val);
} }
@ -772,7 +772,7 @@ static void clock_forward_mgmt_msg(struct clock *c, struct port *p, struct ptp_m
msg_pre_send(msg); msg_pre_send(msg);
} }
if (port_forward(fwd, msg, pdulen)) if (port_forward(fwd, msg, pdulen))
pr_err("port %d: management forward failed", i); pr_err("port %d: management forward failed", i + 1);
} }
} }
if (msg_ready) { if (msg_ready) {