st_com_execute_slave: don't check delay_req any more

The function is called by several states, but only state-slave is checking the delay request timeout. Thus, this commit removes the associated lines from the common function and moves them back to state-slave, the only state that issues delay_request frames. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

st_com_execute_slave: don't check delay_req any more
The function is called by several states, but only state-slave is checking the delay request timeout. Thus, this commit removes the associated lines from the common function and moves them back to state-slave, the only state that issues delay_request frames. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
0443dc94 · Alessandro Rubini · 63eb7add · 0443dc94 · 0443dc94 · 0443dc94
Commit 0443dc94 authored Mar 05, 2013 by Alessandro Rubini
7 changed files
--- a/proto-ext-whiterabbit/state-wr-present.c
+++ b/proto-ext-whiterabbit/state-wr-present.c
@@ -44,7 +44,7 @@ int wr_present(struct pp_instance *ppi, unsigned char *pkt, int plen)
 out:
 	if (e == 0)
-		st_com_execute_slave(ppi, 0);
+		st_com_execute_slave(ppi);
 	else
 		ppi->next_state = PPS_FAULTY;

--- a/proto-standard/common-fun.c
+++ b/proto-standard/common-fun.c
@@ -34,7 +34,7 @@ void pp_prepare_pointers(struct pp_instance *ppi)
 }
 /* Called by listening, passive, slave, uncalibrated */
-int st_com_execute_slave(struct pp_instance *ppi, int check_delayreq)
+int st_com_execute_slave(struct pp_instance *ppi)
 {
 	int ret = 0;
@@ -57,21 +57,7 @@ int st_com_execute_slave(struct pp_instance *ppi, int check_delayreq)
 			pp_timeout_restart_annrec(ppi);
 		}
 	}
+	return 0;
-	if (!check_delayreq)
-		return 0;
-	if (pp_timeout_z(ppi, PP_TO_DELAYREQ)) {
-		ret = msg_issue_delay_req(ppi);
-		ppi->delay_req_send_time = ppi->last_snt_time;
-		/* Add latency */
-		add_TimeInternal(&ppi->delay_req_send_time,
-				 &ppi->delay_req_send_time,
-				 &OPTS(ppi)->outbound_latency);
-	}
-	return ret;
 }
 /* Called by listening, master, passive, slave */

--- a/proto-standard/common-fun.h
+++ b/proto-standard/common-fun.h
@@ -12,7 +12,7 @@
 /* Contains all functions common to more than one state */
 /* returns -1 in case of error, see below */
-int st_com_execute_slave(struct pp_instance *ppi, int check_delayreq);
+int st_com_execute_slave(struct pp_instance *ppi);
 void st_com_restart_annrec_timer(struct pp_instance *ppi);

--- a/proto-standard/state-listening.c
+++ b/proto-standard/state-listening.c
@@ -44,7 +44,7 @@ int pp_listening(struct pp_instance *ppi, unsigned char *pkt, int plen)
 out:
 	if (e == 0)
-		e = st_com_execute_slave(ppi, 0);
+		e = st_com_execute_slave(ppi);
 	if (e != 0)
 		ppi->next_state = PPS_FAULTY;

--- a/proto-standard/state-passive.c
+++ b/proto-standard/state-passive.c
@@ -40,7 +40,7 @@ int pp_passive(struct pp_instance *ppi, unsigned char *pkt, int plen)
 no_incoming_msg:
 	if (e == 0)
-		e = st_com_execute_slave(ppi, 0);
+		e = st_com_execute_slave(ppi);
 	if (e != 0)
 		ppi->next_state = PPS_FAULTY;

--- a/proto-standard/state-slave.c
+++ b/proto-standard/state-slave.c
@@ -112,10 +112,23 @@ int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen)
 out:
 	if (e == 0)
-		e = st_com_execute_slave(ppi, 1);
+		e = st_com_execute_slave(ppi);
-	if (e != 0)
+	if (pp_timeout_z(ppi, PP_TO_DELAYREQ)) {
+		e = msg_issue_delay_req(ppi);
+		ppi->delay_req_send_time = ppi->last_snt_time;
+		/* Add latency */
+		add_TimeInternal(&ppi->delay_req_send_time,
+				 &ppi->delay_req_send_time,
+				 &OPTS(ppi)->outbound_latency);
+	}
+	if (e) {
 		ppi->next_state = PPS_FAULTY;
+		return 0;
+	}
 state_updated:

--- a/proto-standard/state-uncalibrated.c
+++ b/proto-standard/state-uncalibrated.c
@@ -34,7 +34,7 @@ int pp_uncalibrated(struct pp_instance *ppi, unsigned char *pkt, int plen)
 no_incoming_msg:
 	if (e == 0)
-		e = st_com_execute_slave(ppi, 0);
+		e = st_com_execute_slave(ppi);
 	if (e != 0)
 		ppi->next_state = PPS_FAULTY;