slave_only: use slave_only per-port variable instead of Def Dataset slaveOnly

Default Dataset slaveOnly variable is global and cannot be used in multilink context Signed-off-by: Aurelio Colosimo <aurelio@aureliocolosimo.it>

slave_only: use slave_only per-port variable instead of Def Dataset slaveOnly
Default Dataset slaveOnly variable is global and cannot be used in multilink context Signed-off-by: Aurelio Colosimo <aurelio@aureliocolosimo.it>
01eff47c · Aurelio Colosimo · 6bc37928 · 01eff47c · 01eff47c
Commit 01eff47c authored May 02, 2013 by Aurelio Colosimo
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

common-fun.c proto-standard/common-fun.c +1 -1

state-master.c proto-standard/state-master.c +1 -1

No files found.
--- a/proto-standard/common-fun.c
+++ b/proto-standard/common-fun.c
@@ -47,7 +47,7 @@ int st_com_execute_slave(struct pp_instance *ppi)
 	if (pp_timeout_z(ppi, PP_TO_ANN_RECEIPT)) {
 		ppi->frgn_rec_num = 0;
 		ppi->frgn_rec_i = 0;
-		if (!DSDEF(ppi)->slaveOnly &&
+		if (!ppi->slave_only &&
 			DSDEF(ppi)->clockQuality.clockClass != 255) {
 			m1(ppi);
 			ppi->next_state = PPS_MASTER;

--- a/proto-standard/state-master.c
+++ b/proto-standard/state-master.c
@@ -94,7 +94,7 @@ int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
 out:
 	if (e == 0) {
-		if (DSDEF(ppi)->slaveOnly ||
+		if (ppi->slave_only ||
 			DSDEF(ppi)->clockQuality.clockClass == 255)
 			ppi->next_state = PPS_LISTENING;
 	} else {