Change in osmo-bsc[master]: bsc: ts_is_pchan_switching: Return correct IPA dyn TS target_pchan

[Pau Espin Pedrol]

Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/12050 )

Change subject: bsc: ts_is_pchan_switching: Return correct IPA dyn TS target_pchan
......................................................................

bsc: ts_is_pchan_switching: Return correct IPA dyn TS target_pchan

Change-Id: Ie438b4efaa9832c44009a92c3df698875f1fa9ae
---
M src/osmo-bsc/timeslot_fsm.c
1 file changed, 15 insertions(+), 2 deletions(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c
index 269fcd5..d784289 100644
--- a/src/osmo-bsc/timeslot_fsm.c
+++ b/src/osmo-bsc/timeslot_fsm.c
@@ -896,8 +896,21 @@
 	case TS_ST_WAIT_PDCH_DEACT:
 		/* If lchan started a PDCH deact but got somehow released while
 		 * waiting for PDCH DEACT (N)ACK */
-		if (target_pchan)
-			*target_pchan = GSM_PCHAN_NONE;
+		if (target_pchan) {
+			switch (ts->pchan_on_init) {
+			case GSM_PCHAN_TCH_F_TCH_H_PDCH:
+				if (target_pchan)
+					*target_pchan = GSM_PCHAN_NONE;
+				break;
+			case GSM_PCHAN_TCH_F_PDCH:
+				if (target_pchan)
+					*target_pchan = GSM_PCHAN_TCH_F;
+				break;
+			default:
+				/* Can't be in this state and be a non dyn TS */
+				OSMO_ASSERT(false);
+			}
+		}
 		return true;
 
 	default:

-- 
To view, visit https://gerrit.osmocom.org/12050
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie438b4efaa9832c44009a92c3df698875f1fa9ae
Gerrit-Change-Number: 12050
Gerrit-PatchSet: 4
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181205/4ece762e/attachment.htm>