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

config: remove the 'port_defaults' structure. 

This definition is now empty and can serve no purpose any more.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
master
Richard Cochran 2015-08-15 18:47:21 +02:00
parent bbd8d62bec
commit 0bb690c16c
4 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.c
View File

@ -748,10 +748,7 @@ void config_init_interface(struct interface *iface, struct config *cfg)
{ {
iface->dm = cfg->dm; iface->dm = cfg->dm;
iface->transport = cfg->transport; iface->transport = cfg->transport;
memcpy(&iface->pod, &cfg->pod, sizeof(cfg->pod));
sk_get_ts_info(iface->name, &iface->ts_info); sk_get_ts_info(iface->name, &iface->ts_info);
iface->delay_filter = cfg->dds.delay_filter; iface->delay_filter = cfg->dds.delay_filter;
} }

2
config.h
View File

@ -37,7 +37,6 @@ struct interface {
char name[MAX_IFNAME_SIZE + 1]; char name[MAX_IFNAME_SIZE + 1];
enum delay_mechanism dm; enum delay_mechanism dm;
enum transport_type transport; enum transport_type transport;
struct port_defaults pod;
struct sk_ts_info ts_info; struct sk_ts_info ts_info;
enum tsproc_mode tsproc_mode; enum tsproc_mode tsproc_mode;
enum filter_type delay_filter; enum filter_type delay_filter;
@ -64,7 +63,6 @@ struct config {
enum delay_mechanism dm; enum delay_mechanism dm;
struct default_ds dds; struct default_ds dds;
struct port_defaults pod;
enum servo_type clock_servo; enum servo_type clock_servo;
unsigned char *ptp_dst_mac; unsigned char *ptp_dst_mac;

3
ds.h
View File

@ -115,7 +115,4 @@ struct portDS {
#define FRI_ASAP (-128) #define FRI_ASAP (-128)
struct port_defaults {
};
#endif #endif

2
port.c
View File

@ -95,7 +95,6 @@ struct port {
unsigned int multiple_seq_pdr_count; unsigned int multiple_seq_pdr_count;
unsigned int multiple_pdr_detected; unsigned int multiple_pdr_detected;
/* portDS */ /* portDS */
struct port_defaults pod;
struct PortIdentity portIdentity; struct PortIdentity portIdentity;
enum port_state state; /*portState*/ enum port_state state; /*portState*/
Integer64 asymmetry; Integer64 asymmetry;
@ -2533,7 +2532,6 @@ struct port *port_open(int phc_index,
} }
} }
p->pod = interface->pod;
p->name = interface->name; p->name = interface->name;
p->asymmetry = config_get_int(cfg, p->name, "delayAsymmetry"); p->asymmetry = config_get_int(cfg, p->name, "delayAsymmetry");
p->asymmetry <<= 16; p->asymmetry <<= 16;