[MERGED] openbsc[master]: cosmetic: rsl_rx_rf_chan_rel_ack(): use local ts var for bre...

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: cosmetic: rsl_rx_rf_chan_rel_ack(): use local ts var for brevity
......................................................................


cosmetic: rsl_rx_rf_chan_rel_ack(): use local ts var for brevity

In preparation for an upcoming change.

Change-Id: I11bd59492fa8d5b9392d9f2b511c8fa9585afe6c
---
M openbsc/src/libbsc/abis_rsl.c
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c
index 0455189..8547e67 100644
--- a/openbsc/src/libbsc/abis_rsl.c
+++ b/openbsc/src/libbsc/abis_rsl.c
@@ -733,6 +733,7 @@
 
 static int rsl_rx_rf_chan_rel_ack(struct gsm_lchan *lchan)
 {
+	struct gsm_bts_trx_ts *ts = lchan->ts;
 
 	DEBUGP(DRSL, "%s RF CHANNEL RELEASE ACK\n", gsm_lchan_name(lchan));
 
@@ -748,7 +749,7 @@
 	 * will be sent. So let's "repair" the channel.
 	 */
 	if (lchan->state == LCHAN_S_BROKEN) {
-		int do_free = is_sysmobts_v2(lchan->ts->trx->bts);
+		int do_free = is_sysmobts_v2(ts->trx->bts);
 		LOGP(DRSL, LOGL_NOTICE,
 			"%s CHAN REL ACK for broken channel. %s.\n",
 			gsm_lchan_name(lchan),
@@ -778,12 +779,11 @@
 	 */
 	OSMO_ASSERT(lchan->state == LCHAN_S_NONE
 		    || lchan->state == LCHAN_S_REL_ERR);
-	if (lchan->ts->trx->bts->gprs.mode == BTS_GPRS_NONE)
+	if (ts->trx->bts->gprs.mode == BTS_GPRS_NONE)
 		return 0;
-	if (lchan->ts->pchan == GSM_PCHAN_TCH_F_PDCH
+	if (ts->pchan == GSM_PCHAN_TCH_F_PDCH
 	    && lchan->state == LCHAN_S_NONE)
-		return rsl_ipacc_pdch_activate(lchan->ts, 1);
-
+		return rsl_ipacc_pdch_activate(ts, 1);
 	return 0;
 }
 

-- 
To view, visit https://gerrit.osmocom.org/566
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I11bd59492fa8d5b9392d9f2b511c8fa9585afe6c
Gerrit-PatchSet: 4
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>