From 0bb690c16cb28071e49f9b4c1d0c43a211da8e4b Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Sat, 15 Aug 2015 18:47:21 +0200 Subject: [PATCH] config: remove the 'port_defaults' structure. This definition is now empty and can serve no purpose any more. Signed-off-by: Richard Cochran --- config.c | 3 --- config.h | 2 -- ds.h | 3 --- port.c | 2 -- 4 files changed, 10 deletions(-) diff --git a/config.c b/config.c index ee91a40..e1eac73 100644 --- a/config.c +++ b/config.c @@ -748,10 +748,7 @@ void config_init_interface(struct interface *iface, struct config *cfg) { iface->dm = cfg->dm; iface->transport = cfg->transport; - memcpy(&iface->pod, &cfg->pod, sizeof(cfg->pod)); - sk_get_ts_info(iface->name, &iface->ts_info); - iface->delay_filter = cfg->dds.delay_filter; } diff --git a/config.h b/config.h index 30a6803..88120e4 100644 --- a/config.h +++ b/config.h @@ -37,7 +37,6 @@ struct interface { char name[MAX_IFNAME_SIZE + 1]; enum delay_mechanism dm; enum transport_type transport; - struct port_defaults pod; struct sk_ts_info ts_info; enum tsproc_mode tsproc_mode; enum filter_type delay_filter; @@ -64,7 +63,6 @@ struct config { enum delay_mechanism dm; struct default_ds dds; - struct port_defaults pod; enum servo_type clock_servo; unsigned char *ptp_dst_mac; diff --git a/ds.h b/ds.h index d17fb12..a431616 100644 --- a/ds.h +++ b/ds.h @@ -115,7 +115,4 @@ struct portDS { #define FRI_ASAP (-128) -struct port_defaults { -}; - #endif diff --git a/port.c b/port.c index 11fce75..2299831 100644 --- a/port.c +++ b/port.c @@ -95,7 +95,6 @@ struct port { unsigned int multiple_seq_pdr_count; unsigned int multiple_pdr_detected; /* portDS */ - struct port_defaults pod; struct PortIdentity portIdentity; enum port_state state; /*portState*/ Integer64 asymmetry; @@ -2533,7 +2532,6 @@ struct port *port_open(int phc_index, } } - p->pod = interface->pod; p->name = interface->name; p->asymmetry = config_get_int(cfg, p->name, "delayAsymmetry"); p->asymmetry <<= 16;