Change in osmo-bts[master]: [VAMOS] oml_rx_set_chan_attr(): clarify NM_ATT_CHAN_COMB handling

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24484 )

Change subject: [VAMOS] oml_rx_set_chan_attr(): clarify NM_ATT_CHAN_COMB handling
......................................................................

[VAMOS] oml_rx_set_chan_attr(): clarify NM_ATT_CHAN_COMB handling

Change-Id: I8a4aace97515ca59ac4c6b5d50a9ee242edfe409
---
M src/common/oml.c
1 file changed, 8 insertions(+), 7 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/src/common/oml.c b/src/common/oml.c
index 7bf89c5..cf83903 100644
--- a/src/common/oml.c
+++ b/src/common/oml.c
@@ -789,9 +789,12 @@
 	return bts_model_apply_oml(trx->bts, msg, tp_merged, NM_OC_RADIO_CARRIER, trx);
 }
 
-static int conf_lchans(struct gsm_bts_trx_ts *ts)
+static int handle_chan_comb(struct gsm_bts_trx_ts *ts, const uint8_t comb)
 {
-	enum gsm_phys_chan_config pchan = ts->pchan;
+	enum gsm_phys_chan_config pchan;
+
+	pchan = abis_nm_pchan4chcomb(comb);
+	ts->pchan = pchan;
 
 	/* RSL_MT_IPAC_PDCH_ACT style dyn PDCH */
 	if (pchan == GSM_PCHAN_TCH_F_PDCH)
@@ -946,12 +949,10 @@
 
 	/* 9.4.13 Channel Combination */
 	if (TLVP_PRES_LEN(&tp, NM_ATT_CHAN_COMB, 1)) {
-		uint8_t comb = *TLVP_VAL(&tp, NM_ATT_CHAN_COMB);
-		ts->pchan = abis_nm_pchan4chcomb(comb);
-		rc = conf_lchans(ts);
-		if (rc < 0) {
+		const uint8_t comb = *TLVP_VAL(&tp, NM_ATT_CHAN_COMB);
+		if ((rc = handle_chan_comb(ts, comb)) != 0) {
 			LOGPFOH(DOML, LOGL_ERROR, foh, "SET CHAN ATTR: invalid Chan Comb 0x%x"
-				" (pchan=%s, conf_lchans()->%d)\n",
+				" (pchan=%s, handle_chan_comb() returns %d)\n",
 				comb, gsm_pchan_name(ts->pchan), rc);
 			talloc_free(tp_merged);
 			/* Send NACK */

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24484
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I8a4aace97515ca59ac4c6b5d50a9ee242edfe409
Gerrit-Change-Number: 24484
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210604/6fbb8988/attachment.htm>