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

clock: Use the proper create/destroy API for network interfaces. 

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
master
Richard Cochran 2020-02-10 20:57:09 -08:00
parent 5316a36422
commit 52482e0969
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
clock.c
View File

@ -122,7 +122,7 @@ struct clock {
struct clock_stats stats; struct clock_stats stats;
int stats_interval; int stats_interval;
struct clockcheck *sanity_check; struct clockcheck *sanity_check;
struct interface uds_interface; struct interface *udsif;
LIST_HEAD(clock_subscribers_head, clock_subscriber) subscribers; LIST_HEAD(clock_subscribers_head, clock_subscriber) subscribers;
}; };
@ -259,6 +259,7 @@ void clock_destroy(struct clock *c)
{ {
struct port *p, *tmp; struct port *p, *tmp;
interface_destroy(c->udsif);
clock_flush_subscriptions(c); clock_flush_subscriptions(c);
LIST_FOREACH_SAFE(p, &c->ports, list, tmp) { LIST_FOREACH_SAFE(p, &c->ports, list, tmp) {
clock_remove_port(c, p); clock_remove_port(c, p);
@ -854,7 +855,7 @@ struct clock *clock_create(enum clock_type type, struct config *config,
const char *uds_ifname; const char *uds_ifname;
struct port *p; struct port *p;
unsigned char oui[OUI_LEN]; unsigned char oui[OUI_LEN];
struct interface *iface, *udsif = &c->uds_interface; struct interface *iface;
struct timespec ts; struct timespec ts;
int sfl; int sfl;
@ -1003,20 +1004,20 @@ struct clock *clock_create(enum clock_type type, struct config *config,
/* Configure the UDS. */ /* Configure the UDS. */
uds_ifname = config_get_string(config, NULL, "uds_address"); uds_ifname = config_get_string(config, NULL, "uds_address");
interface_set_name(udsif, uds_ifname); c->udsif = interface_create(uds_ifname);
if (config_set_section_int(config, interface_name(udsif), if (config_set_section_int(config, interface_name(c->udsif),
"announceReceiptTimeout", 0)) { "announceReceiptTimeout", 0)) {
return NULL; return NULL;
} }
if (config_set_section_int(config, interface_name(udsif), if (config_set_section_int(config, interface_name(c->udsif),
"delay_mechanism", DM_AUTO)) { "delay_mechanism", DM_AUTO)) {
return NULL; return NULL;
} }
if (config_set_section_int(config, interface_name(udsif), if (config_set_section_int(config, interface_name(c->udsif),
"network_transport", TRANS_UDS)) { "network_transport", TRANS_UDS)) {
return NULL; return NULL;
} }
if (config_set_section_int(config, interface_name(udsif), if (config_set_section_int(config, interface_name(c->udsif),
"delay_filter_length", 1)) { "delay_filter_length", 1)) {
return NULL; return NULL;
} }
@ -1131,7 +1132,7 @@ struct clock *clock_create(enum clock_type type, struct config *config,
} }
/* Create the UDS interface. */ /* Create the UDS interface. */
c->uds_port = port_open(phc_device, phc_index, timestamping, 0, udsif, c); c->uds_port = port_open(phc_device, phc_index, timestamping, 0, c->udsif, c);
if (!c->uds_port) { if (!c->uds_port) {
pr_err("failed to open the UDS port"); pr_err("failed to open the UDS port");
return NULL; return NULL;