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

Remember last used port number 

For the ports to be truly created and removed dynamically, the last used
port number has to be remembered by the clock and used for port creation.

Signed-off-by: Jiri Benc <jbenc@redhat.com>
master
Jiri Benc 2014-08-14 15:56:05 +02:00 committed by Richard Cochran
parent 83f637fb8e
commit c017adc8d1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clock.c
View File

@ -87,6 +87,7 @@ struct clock {
struct pollfd *pollfd; struct pollfd *pollfd;
int pollfd_valid; int pollfd_valid;
int nports; /* does not include the UDS port */ int nports; /* does not include the UDS port */
int last_port_number;
int free_running; int free_running;
int freq_est_interval; int freq_est_interval;
int grand_master_capable; /* for 802.1AS only */ int grand_master_capable; /* for 802.1AS only */
@ -752,14 +753,15 @@ UInteger8 clock_class(struct clock *c)
} }
static int clock_add_port(struct clock *c, int phc_index, static int clock_add_port(struct clock *c, int phc_index,
enum timestamp_type timestamping, int number, enum timestamp_type timestamping,
struct interface *iface) struct interface *iface)
{ {
struct port *p; struct port *p;
if (clock_resize_pollfd(c, c->nports + 1)) if (clock_resize_pollfd(c, c->nports + 1))
return -1; return -1;
p = port_open(phc_index, timestamping, number, iface, c); p = port_open(phc_index, timestamping, ++c->last_port_number,
iface, c);
if (!p) { if (!p) {
/* No need to shrink pollfd */ /* No need to shrink pollfd */
return -1; return -1;
@ -890,6 +892,7 @@ struct clock *clock_create(int phc_index, struct interface *iface, int count,
LIST_INIT(&c->subscribers); LIST_INIT(&c->subscribers);
LIST_INIT(&c->ports); LIST_INIT(&c->ports);
c->last_port_number = 0;
/* /*
* Create the UDS interface. * Create the UDS interface.
@ -907,7 +910,7 @@ struct clock *clock_create(int phc_index, struct interface *iface, int count,
/* Create the ports. */ /* Create the ports. */
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
if (clock_add_port(c, phc_index, timestamping, i + 1, &iface[i])) { if (clock_add_port(c, phc_index, timestamping, &iface[i])) {
pr_err("failed to open port %s", iface[i].name); pr_err("failed to open port %s", iface[i].name);
return NULL; return NULL;
} }