summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-04-09 14:59:46 +0200
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-04-09 15:04:17 +0200
commitbf1eb64b02728ee0dad77751a9ba527e735e2f4a (patch)
tree612cee4288e7f17f2ba95a5b3978b48733c37b1b
parentf0fbae94ea7e22e18a732eb5907137f8033bdf1d (diff)
[rsl] Set the right state when asking for the activation.
Set the state to activation to avoid a warning about the getting a CHAN ACK without waiting for it. We set it in the code to make sure it is set after all error checking to avoid inconsistent state as the state is only set back to NONE/ACT due replies from the BTS.
-rw-r--r--openbsc/src/bssap.c1
-rw-r--r--openbsc/src/handover_logic.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/openbsc/src/bssap.c b/openbsc/src/bssap.c
index 738f3e3ea..352d34676 100644
--- a/openbsc/src/bssap.c
+++ b/openbsc/src/bssap.c
@@ -462,6 +462,7 @@ static int handle_new_assignment(struct msgb *msg, int full_rate, int chan_mode)
return -1;
}
+ rsl_lchan_set_state(new_lchan, LCHAN_S_ACT_REQ);
msc_data->secondary_lchan = new_lchan;
new_lchan->msc_data = msc_data;
return 0;
diff --git a/openbsc/src/handover_logic.c b/openbsc/src/handover_logic.c
index 2d857f43e..dc00b0d09 100644
--- a/openbsc/src/handover_logic.c
+++ b/openbsc/src/handover_logic.c
@@ -134,6 +134,7 @@ int bsc_handover_start(struct gsm_lchan *old_lchan, struct gsm_bts *bts)
return rc;
}
+ rsl_lchan_set_state(new_lchan, LCHAN_S_ACT_REQ);
llist_add(&ho->list, &bsc_handovers);
/* we continue in the SS_LCHAN handler / ho_chan_activ_ack */