[MERGED] osmo-bts[master]: dyn TS: rx_rf_chan_rel: properly mark PDCH rel when no PCU, ...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: dyn TS: rx_rf_chan_rel: properly mark PDCH rel when no PCU, clarify
......................................................................


dyn TS: rx_rf_chan_rel: properly mark PDCH rel when no PCU, clarify

When the PCU is not connected, we immediately call rsl_tx_rf_rel_ack() because
we don't need to wait for a PDCH deactivation. Fix: properly mark rel_act_kind
= LCHAN_REL_ACT_PCU to invoke identical behavior as when the PCU were involved.

(When the PCU is connected, a PDCH release on an Osmocom style dyn TS causes an
actual release of the PDCH TS, and then triggers an rsl_tx_rf_rel_ack() with
rel_act_kind == LCHAN_REL_ACT_PCU.)

Clarify the code flow: rc == 1 is the special case of no PCU being connected,
so have that in a separate if{}.

Change-Id: I654b963815b32fcbce050c2e15f3190c97bc259f
---
M src/common/rsl.c
1 file changed, 7 insertions(+), 4 deletions(-)

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



diff --git a/src/common/rsl.c b/src/common/rsl.c
index cfdb19f..1dc200d 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -1182,10 +1182,13 @@
 	if (lchan->ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH
 	    && lchan->ts->dyn.pchan_is == GSM_PCHAN_PDCH) {
 		rc = dyn_ts_pdch_release(lchan);
-		if (rc != 1)
-			return rc;
-		/* If the PCU is not connected, continue right away. */
-		return rsl_tx_rf_rel_ack(lchan);
+		if (rc == 1) {
+			/* If the PCU is not connected, continue to rel ack right away. */
+			lchan->rel_act_kind = LCHAN_REL_ACT_PCU;
+			return rsl_tx_rf_rel_ack(lchan);
+		}
+		/* Waiting for PDCH release */
+		return rc;
 	}
 
 	l1sap_chan_rel(lchan->ts->trx, chan_nr);

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

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