summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Elder <aelder@audioscience.com>2012-11-29 15:36:16 -0500
committerAndrew Elder <aelder@audioscience.com>2013-01-02 16:39:10 -0500
commitce26667903fd9008e4add34a2c93803a89e9ab18 (patch)
tree93ea06e2cd1bbf4f14c49bc9841d955ff21f9785
parent5852ec29052f3b6b732a0b0d739d647f3006b88b (diff)
downloadOpen-AVB-ce26667903fd9008e4add34a2c93803a89e9ab18.tar.gz
mrpd: call lvatimer stop on MRP_EVENT_LVATIMER
-rw-r--r--daemons/mrpd/mmrp.c1
-rw-r--r--daemons/mrpd/mrp.c1
-rw-r--r--daemons/mrpd/msrp.c1
-rw-r--r--daemons/mrpd/mvrp.c1
4 files changed, 4 insertions, 0 deletions
diff --git a/daemons/mrpd/mmrp.c b/daemons/mrpd/mmrp.c
index 85c9afb3..a6883a81 100644
--- a/daemons/mrpd/mmrp.c
+++ b/daemons/mrpd/mmrp.c
@@ -199,6 +199,7 @@ int mmrp_event(int event, struct mmrp_attribute *rattrib)
switch (event) {
case MRP_EVENT_LVATIMER:
+ mrp_lvatimer_stop(&(MMRP_db->mrp_db));
mrp_jointimer_stop(&(MMRP_db->mrp_db));
/* update state */
attrib = MMRP_db->attrib_list;
diff --git a/daemons/mrpd/mrp.c b/daemons/mrpd/mrp.c
index 5cdb7e97..a7a454b3 100644
--- a/daemons/mrpd/mrp.c
+++ b/daemons/mrpd/mrp.c
@@ -354,6 +354,7 @@ int mrp_lvatimer_fsm(struct mrp_database *mrp_db, int event)
break;
case MRP_EVENT_LVATIMER:
la_state = MRP_TIMER_ACTIVE;
+ mrp_lvatimer_stop(mrp_db);
mrp_lvatimer_start(mrp_db);
break;
default:
diff --git a/daemons/mrpd/msrp.c b/daemons/mrpd/msrp.c
index 136b153d..191ad185 100644
--- a/daemons/mrpd/msrp.c
+++ b/daemons/mrpd/msrp.c
@@ -249,6 +249,7 @@ int msrp_event(int event, struct msrp_attribute *rattrib)
switch (event) {
case MRP_EVENT_LVATIMER:
+ mrp_lvatimer_stop(&(MSRP_db->mrp_db));
mrp_jointimer_stop(&(MSRP_db->mrp_db));
/* update state */
attrib = MSRP_db->attrib_list;
diff --git a/daemons/mrpd/mvrp.c b/daemons/mrpd/mvrp.c
index 92a41ca0..85b60259 100644
--- a/daemons/mrpd/mvrp.c
+++ b/daemons/mrpd/mvrp.c
@@ -145,6 +145,7 @@ int mvrp_event(int event, struct mvrp_attribute *rattrib)
switch (event) {
case MRP_EVENT_LVATIMER:
+ mrp_lvatimer_stop(&(MVRP_db->mrp_db));
mrp_jointimer_stop(&(MVRP_db->mrp_db));
/* update state */
attrib = MVRP_db->attrib_list;