Signed-off-by: Anders Selhammer <[email protected]>
---
bmc.c | 2 +-
clock.c | 6 +++---
clock.h | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/bmc.c b/bmc.c
index 198a574..605183e 100644
--- a/bmc.c
+++ b/bmc.c
@@ -145,7 +145,7 @@ enum port_state bmc_state_decision(struct clock *c, struct
port *r,
struct dataset *clock_ds, *clock_best, *port_best;
enum port_state ps;
- clock_ds = clock_default_ds(c);
+ clock_ds = clock_dataset(c);
clock_best = clock_best_foreign(c);
port_best = port_best_foreign(r);
ps = port_state(r);
diff --git a/clock.c b/clock.c
index 1a863df..10c601d 100644
--- a/clock.c
+++ b/clock.c
@@ -81,8 +81,8 @@ struct clock {
struct servo *servo;
enum servo_type servo_type;
dscmp_type dscmp;
+ struct dataset dataset;
struct defaultDS dds;
- struct dataset default_dataset;
struct currentDS cur;
struct parent_ds dad;
struct timePropertiesDS tds;
@@ -1144,9 +1144,9 @@ struct port *clock_best_port(struct clock *c)
return c->best ? c->best->port : NULL;
}
-struct dataset *clock_default_ds(struct clock *c)
+struct dataset *clock_dataset(struct clock *c)
{
- struct dataset *out = &c->default_dataset;
+ struct dataset *out = &c->dataset;
struct defaultDS *in = &c->dds;
out->priority1 = in->priority1;
diff --git a/clock.h b/clock.h
index b2bdc3f..d43ce95 100644
--- a/clock.h
+++ b/clock.h
@@ -109,11 +109,11 @@ struct clock *clock_create(enum clock_type type, struct
config *config,
const char *phc_device);
/**
- * Obtains a clock's default data set.
+ * Obtains a clock's dataset.
* @param c The clock instance.
- * @return A pointer to the data set of the clock.
+ * @return A pointer to the dataset of the clock.
*/
-struct dataset *clock_default_ds(struct clock *c);
+struct dataset *clock_dataset(struct clock *c);
/**
* Free all of the resources associated with a clock.
--
1.8.3.1
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Linuxptp-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxptp-devel
