diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2016-07-14 16:16:33 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-07-25 15:21:24 +0000 |
| commit | f29dd5f15b315d1363d7302c50f2c9aceade8ccc (patch) | |
| tree | 4ad63de5bba5334516a2deedb55309eb62ec585f /openbsc | |
| parent | 8151648ceb4688cac9ced9b1c159c6e1968fc0f1 (diff) | |
cosmetic: rsl_rx_chan_act_ack(): use local lchan var in 14 instances
In preparation for an upcoming change.
Change-Id: I9ce71fd7dde42ad7d20f806ac70c150d11450efa
Diffstat (limited to 'openbsc')
| -rw-r--r-- | openbsc/src/libbsc/abis_rsl.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c index 42adec9db..0a2c114f4 100644 --- a/openbsc/src/libbsc/abis_rsl.c +++ b/openbsc/src/libbsc/abis_rsl.c @@ -979,34 +979,35 @@ int rsl_lchan_set_state(struct gsm_lchan *lchan, int state) static int rsl_rx_chan_act_ack(struct msgb *msg) { struct abis_rsl_dchan_hdr *rslh = msgb_l2(msg); + struct gsm_lchan *lchan = msg->lchan; /* BTS has confirmed channel activation, we now need * to assign the activated channel to the MS */ if (rslh->ie_chan != RSL_IE_CHAN_NR) return -EINVAL; - osmo_timer_del(&msg->lchan->act_timer); + osmo_timer_del(&lchan->act_timer); - if (msg->lchan->state == LCHAN_S_BROKEN) { + if (lchan->state == LCHAN_S_BROKEN) { LOGP(DRSL, LOGL_NOTICE, "%s CHAN ACT ACK for broken channel.\n", - gsm_lchan_name(msg->lchan)); + gsm_lchan_name(lchan)); return 0; } - if (msg->lchan->state != LCHAN_S_ACT_REQ) + if (lchan->state != LCHAN_S_ACT_REQ) LOGP(DRSL, LOGL_NOTICE, "%s CHAN ACT ACK, but state %s\n", - gsm_lchan_name(msg->lchan), - gsm_lchans_name(msg->lchan->state)); - rsl_lchan_set_state(msg->lchan, LCHAN_S_ACTIVE); - - if (msg->lchan->rqd_ref) { - rsl_send_imm_assignment(msg->lchan); - talloc_free(msg->lchan->rqd_ref); - msg->lchan->rqd_ref = NULL; - msg->lchan->rqd_ta = 0; + gsm_lchan_name(lchan), + gsm_lchans_name(lchan->state)); + rsl_lchan_set_state(lchan, LCHAN_S_ACTIVE); + + if (lchan->rqd_ref) { + rsl_send_imm_assignment(lchan); + talloc_free(lchan->rqd_ref); + lchan->rqd_ref = NULL; + lchan->rqd_ta = 0; } - send_lchan_signal(S_LCHAN_ACTIVATE_ACK, msg->lchan, NULL); + send_lchan_signal(S_LCHAN_ACTIVATE_ACK, lchan, NULL); return 0; } |