[MERGED] osmo-bts[master]: DTX: don't always perform AMR HR specific check

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: DTX: don't always perform AMR HR specific check
......................................................................


DTX: don't always perform AMR HR specific check

Disable check specific to AMR HR if not DTX is enabled.

Change-Id: I8af1daffbd7e59fef6e671dbd9b820497f82d354
Fixes: OS#1892
---
M src/common/msg_utils.c
1 file changed, 8 insertions(+), 6 deletions(-)

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



diff --git a/src/common/msg_utils.c b/src/common/msg_utils.c
index b844eec..9de9b6d 100644
--- a/src/common/msg_utils.c
+++ b/src/common/msg_utils.c
@@ -156,12 +156,14 @@
 	int8_t sti, cmi;
 	int rc;
 
-	if (lchan->type == GSM_LCHAN_TCH_H && /* SID-FIRST P1 -> P2 completion */
-	    lchan->tch.dtx.dl_amr_fsm->state == ST_SID_F2 && !rtp_pl) {
-		*len = 3;
-		memcpy(l1_payload, lchan->tch.dtx.cache, 2);
-		dtx_dispatch(lchan, E_SID_U);
-		return 0;
+	if (dtx_dl_amr_enabled(lchan)) {
+		if (lchan->type == GSM_LCHAN_TCH_H &&
+		    lchan->tch.dtx.dl_amr_fsm->state == ST_SID_F2 && !rtp_pl) {
+			*len = 3; /* SID-FIRST P1 -> P2 completion */
+			memcpy(l1_payload, lchan->tch.dtx.cache, 2);
+			dtx_dispatch(lchan, E_SID_U);
+			return 0;
+		}
 	}
 
 	if (!rtp_pl_len)

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

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