Re: [Linuxptp-devel] [PATCH RFC 23/30] Convert call sites to the proper method for testing time stamping modes.
On 2/11/2020 6:04 AM, Richard Cochran wrote: > Signed-off-by: Richard Cochran Reviewed-by: Jacob Keller > --- > clock.c | 2 +- > port.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/clock.c b/clock.c > index 845e27a..71b5795 100644 > --- a/clock.c > +++ b/clock.c > @@ -957,7 +957,7 @@ struct clock *clock_create(enum clock_type type, struct > config *config, > interface_ensure_tslabel(iface); > interface_get_tsinfo(iface); > if (interface_tsinfo_valid(iface) && > - ((iface->ts_info.so_timestamping & required_modes) != > required_modes)) { This actually makes the line shorter too! Nice. > + !interface_tsmodes_supported(iface, required_modes)) { > pr_err("interface '%s' does not support requested > timestamping mode", > interface_name(iface)); > return NULL; > diff --git a/port.c b/port.c > index b590024..6b87bc9 100644 > --- a/port.c > +++ b/port.c > @@ -2514,7 +2514,7 @@ void port_link_status(void *ctx, int linkup, int > ts_index) > if (interface_tsinfo_valid(p->iface) && > interface_phc_index(p->iface) >= 0) { > required_modes = clock_required_modes(p->clock); > - if ((p->iface->ts_info.so_timestamping & > required_modes) != required_modes) { > + if (!interface_tsmodes_supported(p->iface, > required_modes)) { > pr_err("interface '%s' does not support > requested " > "timestamping mode, set link status down > by force.", > interface_label(p->iface)); > ___ Linuxptp-devel mailing list Linuxptp-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxptp-devel
[Linuxptp-devel] [PATCH RFC 23/30] Convert call sites to the proper method for testing time stamping modes.
Signed-off-by: Richard Cochran --- clock.c | 2 +- port.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clock.c b/clock.c index 845e27a..71b5795 100644 --- a/clock.c +++ b/clock.c @@ -957,7 +957,7 @@ struct clock *clock_create(enum clock_type type, struct config *config, interface_ensure_tslabel(iface); interface_get_tsinfo(iface); if (interface_tsinfo_valid(iface) && - ((iface->ts_info.so_timestamping & required_modes) != required_modes)) { + !interface_tsmodes_supported(iface, required_modes)) { pr_err("interface '%s' does not support requested timestamping mode", interface_name(iface)); return NULL; diff --git a/port.c b/port.c index b590024..6b87bc9 100644 --- a/port.c +++ b/port.c @@ -2514,7 +2514,7 @@ void port_link_status(void *ctx, int linkup, int ts_index) if (interface_tsinfo_valid(p->iface) && interface_phc_index(p->iface) >= 0) { required_modes = clock_required_modes(p->clock); - if ((p->iface->ts_info.so_timestamping & required_modes) != required_modes) { + if (!interface_tsmodes_supported(p->iface, required_modes)) { pr_err("interface '%s' does not support requested " "timestamping mode, set link status down by force.", interface_label(p->iface)); -- 2.20.1 ___ Linuxptp-devel mailing list Linuxptp-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxptp-devel