Change in osmo-bsc[master]: gsm_data: Update trx_is_usable for ericsson BTS

[laforge]

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

Change subject: gsm_data: Update trx_is_usable for ericsson BTS
......................................................................

gsm_data: Update trx_is_usable for ericsson BTS

There is no bb_transc oject.

Signed-off-by: Sylvain Munaut <tnt at 246tNt.com>
Change-Id: I34bb808cd21575ff25d36e6df028b140935a008f
---
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/gsm_data.c
2 files changed, 16 insertions(+), 0 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index ecc1f0a..545019b 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -1719,6 +1719,18 @@
 	return 0;
 }
 
+static inline int is_ericsson_bts(struct gsm_bts *bts)
+{
+	switch (bts->type) {
+	case GSM_BTS_TYPE_RBS2000:
+		return 1;
+	default:
+		break;
+	}
+
+	return 0;
+}
+
 static inline int is_e1_bts(struct gsm_bts *bts)
 {
 	switch (bts->type) {
diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c
index 23a4e61..d3c58f5 100644
--- a/src/osmo-bsc/gsm_data.c
+++ b/src/osmo-bsc/gsm_data.c
@@ -1399,6 +1399,10 @@
 		if (!nm_is_running(&trx->mo.nm_state) ||
 		    !nm_is_running(&trx->bb_transc.mo.nm_state))
 			return false;
+	} else if (is_ericsson_bts(trx->bts)) {
+		/* The OM2000 -> 12.21 mapping we do doesn't have separate bb_transc MO */
+		if (!nm_is_running(&trx->mo.nm_state))
+			return false;
 	}
 
 	return true;

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

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I34bb808cd21575ff25d36e6df028b140935a008f
Gerrit-Change-Number: 18128
Gerrit-PatchSet: 7
Gerrit-Owner: tnt <tnt at 246tNt.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: tnt <tnt at 246tNt.com>
Gerrit-CC: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200509/b784ac07/attachment.htm>