From 42745f4ebb235d73773eebd8d0abc963a3b511af Mon Sep 17 00:00:00 2001 From: Dave Page Date: Wed, 5 Mar 2014 06:36:18 +1300 Subject: [PATCH] Fix fsm_foe timeout regression --- master/fsm_foe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/master/fsm_foe.c b/master/fsm_foe.c index 76fdbc9a..4470c91c 100644 --- a/master/fsm_foe.c +++ b/master/fsm_foe.c @@ -374,7 +374,7 @@ void ec_fsm_foe_state_ack_check( if (!ec_slave_mbox_check(fsm->datagram)) { // slave did not put anything in the mailbox yet - if (time_after(datagram->jiffies_received, + if (time_after(fsm->datagram->jiffies_received, fsm->jiffies_start + EC_FSM_FOE_TIMEOUT_JIFFIES)) { ec_foe_set_tx_error(fsm, FOE_TIMEOUT_ERROR); EC_SLAVE_ERR(slave, "Timeout while waiting for ack response.\n"); @@ -736,7 +736,7 @@ void ec_fsm_foe_state_data_check( } if (!ec_slave_mbox_check(fsm->datagram)) { - if (time_after(datagram->jiffies_received, + if (time_after(fsm->datagram->jiffies_received, fsm->jiffies_start + EC_FSM_FOE_TIMEOUT_JIFFIES)) { ec_foe_set_tx_error(fsm, FOE_TIMEOUT_ERROR); EC_SLAVE_ERR(slave, "Timeout while waiting for ack response.\n");