Change in osmo-bts[master]: rsl: Send PDCH ACT NACK if TCH chan is still active

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12180


Change subject: rsl: Send PDCH ACT NACK if TCH chan is still active
......................................................................

rsl: Send PDCH ACT NACK if TCH chan is still active

Fix recent commit which broke TTCN3 BTS_tests
TC_dyn_ipa_pdch_tchf_act_pdch_act_nack.

Prior to the breaking commit, logic was still not good, because
1- It didn't return after sending the NACK
2- It sent a NACK in all cases, while for PDCH DEACT we want to force
its deactivation. Going through tests it can be seen that indeed it
can deactivate it in that case:
rsl.c:2206 (bts=0,trx=0,ts=3,pchan=TCH/F_PDCH as PDCH) Request to PDCH DEACT, but lchan is still in state ACTIVE
...
rsl.c:2103 (bts=0,trx=0,ts=3,ss=0) Tx PDCH DEACT ACK

Fixes: 133a3d96dc07ebda4dfc7899dab9c0d0c80c9fea ("rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK")
Change-Id: I6d6d12aec10c801fe55012ca6e58d0bc8755b15d
---
M src/common/rsl.c
1 file changed, 6 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/80/12180/1

diff --git a/src/common/rsl.c b/src/common/rsl.c
index 507e8aa..61bf6a1 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -2204,6 +2204,12 @@
 		     "%s Request to PDCH %s, but lchan is still in state %s\n",
 		     gsm_ts_and_pchan_name(ts), pdch_act? "ACT" : "DEACT",
 		     gsm_lchans_name(lchan->state));
+		/* TCH takes preference over PDCH so allow forcing PDCH DEACT,
+		 * but forbid forcing PDCH ACT if lchan still active */
+		if (pdch_act) {
+			rsl_tx_dyn_pdch_nack(lchan, pdch_act, RSL_ERR_NORMAL_UNSPEC);
+			return;
+		}
 	}
 
 	ts->flags |= pdch_act? TS_F_PDCH_ACT_PENDING

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

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d6d12aec10c801fe55012ca6e58d0bc8755b15d
Gerrit-Change-Number: 12180
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181206/01f8876e/attachment.htm>