Osmocom Open Build Service

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 454

osmo-bsc.spec Changed

@@ -17,14 +17,14 @@
 %define _lto_cflags %{nil}
 
 Name:           osmo-bsc
-Requires: osmocom-nightly = 202309142026
-Version: 1.11.0.6.c3446.202309142026
+Requires: osmocom-nightly = 202309152026
+Version: 1.11.0.9.44543.202309152026
 Release:        0
 Summary:        OsmoBSC: Osmocom's Base Station Controller for 2G CS mobile networks
 License:        AGPL-3.0-or-later AND GPL-2.0-or-later
 Group:          Hardware/Mobile
 URL:            https://osmocom.org/projects/osmobsc
-Source: osmo-bsc_1.11.0.6.c3446.202309142026.tar.xz
+Source: osmo-bsc_1.11.0.9.44543.202309152026.tar.xz
 Source1: rpmlintrc
 BuildRequires:  automake >= 1.9
 BuildRequires:  libtool >= 2
@@ -49,7 +49,7 @@
 OsmoBSC: Osmocom's Base Station Controller for 2G circuit-switched mobile networks.
 
 %package abisip-find
-Requires: osmocom-nightly = 202309142026
+Requires: osmocom-nightly = 202309152026
 Summary:        CLI utility to find ip.access compatible BTS
 License:        GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities
@@ -58,7 +58,7 @@
 Command line utility to find ip.access compatible BTS.
 
 %package ipaccess-utils
-Requires: osmocom-nightly = 202309142026
+Requires: osmocom-nightly = 202309152026
 Summary:        Command line utilities for ip.access nanoBTS
 License:        GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities
@@ -69,7 +69,7 @@
 and ipaccess-proxy.
 
 %package bs11-utils
-Requires: osmocom-nightly = 202309142026
+Requires: osmocom-nightly = 202309152026
 Summary:        Command line utilities for Siemens BS-11 BTS
 License:        GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities
@@ -80,7 +80,7 @@
 public telephone network as frequency standard for the E1 line.
 
 %package meas-utils
-Requires: osmocom-nightly = 202309142026
+Requires: osmocom-nightly = 202309152026
 Summary:        Command line utilities for OsmoBSC's measurement reports
 License:        GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities

osmo-bsc_1.11.0.6.c3446.202309142026.dsc -> osmo-bsc_1.11.0.9.44543.202309152026.dsc Changed

@@ -2,7 +2,7 @@
 Source: osmo-bsc
 Binary: osmo-bsc, osmo-bsc-dbg, abisip-find, osmo-bsc-ipaccess-utils, osmo-bsc-bs11-utils, osmo-bsc-meas-utils, osmo-bsc-doc
 Architecture: any all
-Version: 1.11.0.6.c3446.202309142026
+Version: 1.11.0.9.44543.202309152026
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/osmo-bsc
 Standards-Version: 3.9.8
@@ -18,8 +18,8 @@
  osmo-bsc-ipaccess-utils deb net extra arch=any
  osmo-bsc-meas-utils deb net extra arch=any
 Checksums-Sha1:
- aa9624c11464d17ac46469397f3bdcbb78eb7392 617480 osmo-bsc_1.11.0.6.c3446.202309142026.tar.xz
+ 5731c1ebb9701c0b49ac9a8f830fb24293aa642b 617424 osmo-bsc_1.11.0.9.44543.202309152026.tar.xz
 Checksums-Sha256:
- 98d50b9e040f641b418838559be8e7107c4545ff3c359fa60e54168c43b5543d 617480 osmo-bsc_1.11.0.6.c3446.202309142026.tar.xz
+ 8e69cbd27808c1e7e12ee7fe9713c55e10e57906424a4e29f242c8ee00b5d4c6 617424 osmo-bsc_1.11.0.9.44543.202309152026.tar.xz
 Files:
- 2c59a489726367090f4532431e04dd03 617480 osmo-bsc_1.11.0.6.c3446.202309142026.tar.xz
+ 2a563eb3205f039416e6b43850bea876 617424 osmo-bsc_1.11.0.9.44543.202309152026.tar.xz

osmo-bsc_1.11.0.6.c3446.202309142026.tar.xz/.tarball-version -> osmo-bsc_1.11.0.9.44543.202309152026.tar.xz/.tarball-version Changed

osmo-bsc_1.11.0.6.c3446.202309142026.tar.xz/contrib/osmo-bsc.spec.in -> osmo-bsc_1.11.0.9.44543.202309152026.tar.xz/contrib/osmo-bsc.spec.in Changed

@@ -17,7 +17,7 @@
 %define _lto_cflags %{nil}
 
 Name:           osmo-bsc
-Requires: osmocom-nightly = 202309142026
+Requires: osmocom-nightly = 202309152026
 Version:        @VERSION@
 Release:        0
 Summary:        OsmoBSC: Osmocom's Base Station Controller for 2G CS mobile networks
@@ -48,7 +48,7 @@
 OsmoBSC: Osmocom's Base Station Controller for 2G circuit-switched mobile networks.
 
 %package abisip-find
-Requires: osmocom-nightly = 202309142026
+Requires: osmocom-nightly = 202309152026
 Summary:        CLI utility to find ip.access compatible BTS
 License:        GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities
@@ -57,7 +57,7 @@
 Command line utility to find ip.access compatible BTS.
 
 %package ipaccess-utils
-Requires: osmocom-nightly = 202309142026
+Requires: osmocom-nightly = 202309152026
 Summary:        Command line utilities for ip.access nanoBTS
 License:        GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities
@@ -68,7 +68,7 @@
 and ipaccess-proxy.
 
 %package bs11-utils
-Requires: osmocom-nightly = 202309142026
+Requires: osmocom-nightly = 202309152026
 Summary:        Command line utilities for Siemens BS-11 BTS
 License:        GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities
@@ -79,7 +79,7 @@
 public telephone network as frequency standard for the E1 line.
 
 %package meas-utils
-Requires: osmocom-nightly = 202309142026
+Requires: osmocom-nightly = 202309152026
 Summary:        Command line utilities for OsmoBSC's measurement reports
 License:        GPL-2.0-or-later
 Group:          Productivity/Telephony/Utilities

osmo-bsc_1.11.0.6.c3446.202309142026.tar.xz/debian/changelog -> osmo-bsc_1.11.0.9.44543.202309152026.tar.xz/debian/changelog Changed

osmo-bsc_1.11.0.6.c3446.202309142026.tar.xz/debian/control -> osmo-bsc_1.11.0.9.44543.202309152026.tar.xz/debian/control Changed

@@ -26,7 +26,7 @@
 Package: osmo-bsc
 Architecture: any
 Multi-Arch: foreign
-Depends: osmocom-nightly (= 202309142026), ${misc:Depends}, ${shlibs:Depends}
+Depends: osmocom-nightly (= 202309152026), ${misc:Depends}, ${shlibs:Depends}
 Recommends: osmo-mgw
 Description: OsmoBSC: Osmocom's Base Station Controller for 2G circuit-switched mobile networks
 
@@ -34,19 +34,19 @@
 Section: debug
 Architecture: any
 Multi-Arch: same
-Depends: osmocom-nightly (= 202309142026), osmo-bsc (= ${binary:Version}), ${misc:Depends}
+Depends: osmocom-nightly (= 202309152026), osmo-bsc (= ${binary:Version}), ${misc:Depends}
 Description: OsmoBSC: Osmocom's Base Station Controller for 2G circuit-switched mobile networks
 
 Package: abisip-find
 Architecture: any
 Multi-Arch: foreign
-Depends: osmocom-nightly (= 202309142026), ${misc:Depends}, ${shlibs:Depends}
+Depends: osmocom-nightly (= 202309152026), ${misc:Depends}, ${shlibs:Depends}
 Description: Command line utility to find ip.access compatible BTS
 
 Package: osmo-bsc-ipaccess-utils
 Architecture: any
 Multi-Arch: foreign
-Depends: osmocom-nightly (= 202309142026), ${misc:Depends}, ${shlibs:Depends}
+Depends: osmocom-nightly (= 202309152026), ${misc:Depends}, ${shlibs:Depends}
 Description: Command line utilities for ip.access nanoBTS
  This package contains utilities that are specific for nanoBTS when being used
  together with OpenBSC. It contains mainly two tools: ipaccess-config and ipaccess-proxy.
@@ -54,7 +54,7 @@
 Package: osmo-bsc-bs11-utils
 Architecture: any
 Multi-Arch: foreign
-Depends: osmocom-nightly (= 202309142026), ${misc:Depends}, ${shlibs:Depends}
+Depends: osmocom-nightly (= 202309152026), ${misc:Depends}, ${shlibs:Depends}
 Description: Command line utilities for Siemens BS-11 BTS
  There is a tool in this package for configuring the Siemens BS-11 BTS.
  Additionally, it contains one tool for making use of an ISDN-card and the
@@ -63,14 +63,14 @@
 Package: osmo-bsc-meas-utils
 Architecture: any
 Multi-Arch: foreign
-Depends: osmocom-nightly (= 202309142026), ${misc:Depends}, ${shlibs:Depends}
+Depends: osmocom-nightly (= 202309152026), ${misc:Depends}, ${shlibs:Depends}
 Description: Command line utilities to manage measurement reports.
 
 Package: osmo-bsc-doc
 Architecture: all
 Section: doc
 Priority: optional
-Depends: osmocom-nightly (= 202309142026), ${misc:Depends}
+Depends: osmocom-nightly (= 202309152026), ${misc:Depends}
 Description: ${misc:Package} PDF documentation
  Various manuals: user manual, VTY reference manual and/or
  protocol/interface manuals.

osmo-bsc_1.11.0.6.c3446.202309142026.tar.xz/include/osmocom/bsc/gsm_data.h -> osmo-bsc_1.11.0.9.44543.202309152026.tar.xz/include/osmocom/bsc/gsm_data.h Changed

osmo-bsc_1.11.0.6.c3446.202309142026.tar.xz/src/osmo-bsc/bts_ipaccess_nanobts.c -> osmo-bsc_1.11.0.9.44543.202309152026.tar.xz/src/osmo-bsc/bts_ipaccess_nanobts.c Changed

@@ -195,156 +195,65 @@
 /* Callback function to be called every time we receive a 12.21 SW activated report */
 static int sw_activ_rep(struct msgb *mb)
 {
-	struct abis_om_fom_hdr *foh = msgb_l3(mb);
+	const struct abis_om_fom_hdr *foh = msgb_l3(mb);
 	struct e1inp_sign_link *sign_link = mb->dst;
 	struct gsm_bts *bts = sign_link->trx->bts;
-	struct gsm_bts_trx *trx;
-	struct gsm_gprs_nsvc *nsvc;
-	struct gsm_bts_trx_ts *ts;
+	struct gsm_abis_mo *mo;
+	struct tlv_parsed tp;
 
 	if (!is_ipa_abisip_bts(bts))
 		return 0;
 
-	switch (foh->obj_class) {
-	case NM_OC_SITE_MANAGER:
-		osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_SW_ACT_REP, NULL);
-		break;
-	case NM_OC_BTS:
-		osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_SW_ACT_REP, NULL);
-		break;
-	case NM_OC_BASEB_TRANSC:
-		if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
-			return -EINVAL;
-		osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT_REP, NULL);
-		break;
-	case NM_OC_RADIO_CARRIER:
-		if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
-			return -EINVAL;
-		osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT_REP, NULL);
-		break;
-	case NM_OC_CHANNEL:
-		if (!(ts = abis_nm_get_ts(mb)))
-			return -EINVAL;
-		osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_SW_ACT_REP, NULL);
-		break;
-	case NM_OC_GPRS_NSE:
-		osmo_fsm_inst_dispatch(bts->site_mgr->gprs.nse.mo.fi, NM_EV_SW_ACT_REP, NULL);
-		break;
-	case NM_OC_GPRS_CELL:
-		osmo_fsm_inst_dispatch(bts->gprs.cell.mo.fi, NM_EV_SW_ACT_REP, NULL);
-		break;
-	case NM_OC_GPRS_NSVC:
-		if (!(nsvc = gsm_bts_sm_nsvc_num(bts->site_mgr, foh->obj_inst.trx_nr)))
-			return -EINVAL;
-		osmo_fsm_inst_dispatch(nsvc->mo.fi, NM_EV_SW_ACT_REP, NULL);
-		break;
+	mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst);
+	if (mo == NULL) {
+		LOGPFOH(DNM, LOGL_ERROR, foh, "Rx SW activated report for non-existent MO\n");
+		return -ENOENT;
 	}
-	return 0;
-}
 
-static void nm_rx_opstart_ack_chan(struct msgb *oml_msg)
-{
-	struct gsm_bts_trx_ts *ts;
-	ts = abis_nm_get_ts(oml_msg);
-	if (!ts)
-		/* error already logged in abis_nm_get_ts() */
-		return;
-	if (!ts->fi) {
-		LOG_TS(ts, LOGL_ERROR, "Channel OPSTART ACK for uninitialized TS\n");
-		return;
+	if (abis_nm_tlv_parse(&tp, bts, &foh->data0, msgb_l3len(mb) - sizeof(*foh)) < 0) {
+		LOGPFOH(DNM, LOGL_ERROR, foh, "%s(): tlv_parse failed\n", __func__);
+		return -EINVAL;
 	}
-	osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_OPSTART_ACK, NULL);
+
+	mo->ipaccess.obj_version = 0; /* implicit default */
+	if (TLVP_PRES_LEN(&tp, NM_ATT_IPACC_OBJ_VERSION, 1)) {
+		/* nanoBTS may report several Object Versions;  the first one will
+		 * be used by default unless requested explicitly before OPSTARTing. */
+		mo->ipaccess.obj_version = *TLVP_VAL(&tp, NM_ATT_IPACC_OBJ_VERSION);
+		LOGPFOH(DNM, LOGL_INFO, foh, "IPA Object Version is %u (default)\n",
+			mo->ipaccess.obj_version);
+	}
+
+	osmo_fsm_inst_dispatch(mo->fi, NM_EV_SW_ACT_REP, NULL);
+	return 0;
 }
 
 static void nm_rx_opstart_ack(struct msgb *oml_msg)
 {
-	struct abis_om_fom_hdr *foh = msgb_l3(oml_msg);
+	const struct abis_om_fom_hdr *foh = msgb_l3(oml_msg);
 	struct e1inp_sign_link *sign_link = oml_msg->dst;
 	struct gsm_bts *bts = sign_link->trx->bts;
-	struct gsm_bts_trx *trx;
-	struct gsm_gprs_nsvc *nsvc;
+	struct gsm_abis_mo *mo;
 
-	switch (foh->obj_class) {
-	case NM_OC_SITE_MANAGER:
-		osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_OPSTART_ACK, NULL);
-		break;
-	case NM_OC_BTS:
-		osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OPSTART_ACK, NULL);
-		break;
-	case NM_OC_RADIO_CARRIER:
-		if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
-			return;
-		osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_ACK, NULL);
-		break;
-	case NM_OC_BASEB_TRANSC:
-		if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
-			return;
-		osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_OPSTART_ACK, NULL);
-		break;
-	case NM_OC_CHANNEL:
-		nm_rx_opstart_ack_chan(oml_msg);
-		break;
-	case NM_OC_GPRS_NSE:
-		osmo_fsm_inst_dispatch(bts->site_mgr->gprs.nse.mo.fi, NM_EV_OPSTART_ACK, NULL);
-		break;
-	case NM_OC_GPRS_CELL:
-		osmo_fsm_inst_dispatch(bts->gprs.cell.mo.fi, NM_EV_OPSTART_ACK, NULL);
-		break;
-	case NM_OC_GPRS_NSVC:
-		if (!(nsvc = gsm_bts_sm_nsvc_num(bts->site_mgr, foh->obj_inst.trx_nr)))
-			return;
-		osmo_fsm_inst_dispatch(nsvc->mo.fi, NM_EV_OPSTART_ACK, NULL);
-		break;
-	default:
-		break;
-	}
+	mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst);
+	if (mo == NULL)
+		LOGPFOH(DNM, LOGL_ERROR, foh, "Rx OPSTART ACK for non-existent MO\n");
+	else
+		osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_ACK, NULL);
 }
 
 static void nm_rx_opstart_nack(struct msgb *oml_msg)
 {
-	struct abis_om_fom_hdr *foh = msgb_l3(oml_msg);
+	const struct abis_om_fom_hdr *foh = msgb_l3(oml_msg);
 	struct e1inp_sign_link *sign_link = oml_msg->dst;
 	struct gsm_bts *bts = sign_link->trx->bts;
-	struct gsm_bts_trx *trx;
-	struct gsm_bts_trx_ts *ts;
-	struct gsm_gprs_nsvc *nsvc;
-
-	switch (foh->obj_class) {
-	case NM_OC_SITE_MANAGER:
-		osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_OPSTART_NACK, NULL);
-		break;
-	case NM_OC_BTS:
-		osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OPSTART_ACK, NULL);
-		break;
-	case NM_OC_RADIO_CARRIER:
-		if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
-			return;
-		osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_NACK, NULL);
-		break;
-	case NM_OC_BASEB_TRANSC:
-		if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
-			return;
-		osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_OPSTART_NACK, NULL);
-		break;
-	case NM_OC_CHANNEL:
-		if (!(ts = abis_nm_get_ts(oml_msg)))
-			return;
-		osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_OPSTART_NACK, NULL);
-		break;
-	case NM_OC_GPRS_NSE:
-		osmo_fsm_inst_dispatch(bts->site_mgr->gprs.nse.mo.fi, NM_EV_OPSTART_NACK, NULL);
-		break;
-	case NM_OC_GPRS_CELL:
-		osmo_fsm_inst_dispatch(bts->gprs.cell.mo.fi, NM_EV_OPSTART_NACK, NULL);
-		break;
-	case NM_OC_GPRS_NSVC:
-		if (!(nsvc = gsm_bts_sm_nsvc_num(bts->site_mgr, foh->obj_inst.trx_nr)))
-			return;
-		osmo_fsm_inst_dispatch(nsvc->mo.fi, NM_EV_OPSTART_NACK, NULL);
-		break;
-	default:
-		break;
-	}
+	struct gsm_abis_mo *mo;
+
+	mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst);
+	if (mo == NULL)
+		LOGPFOH(DNM, LOGL_ERROR, foh, "Rx OPSTART NACK for non-existent MO\n");
+	else
+		osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_NACK, NULL);
 }
 
 static void nm_rx_get_attr_rep(struct msgb *oml_msg)
@@ -352,20 +261,13 @@
 	struct abis_om_fom_hdr *foh = msgb_l3(oml_msg);
 	struct e1inp_sign_link *sign_link = oml_msg->dst;
 	struct gsm_bts *bts = sign_link->trx->bts;
-	struct gsm_bts_trx *trx;
+	struct gsm_abis_mo *mo;

osmo-bsc_1.11.0.6.c3446.202309142026.tar.xz/src/osmo-bsc/gsm_data.c -> osmo-bsc_1.11.0.9.44543.202309152026.tar.xz/src/osmo-bsc/gsm_data.c Changed

@@ -327,85 +327,56 @@
 }
 
 /* obtain the MO structure for a given object instance */
-static inline struct gsm_abis_mo *
-gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class,
-	    const struct abis_om_obj_inst *obj_inst)
+struct gsm_abis_mo *gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class,
+				    const struct abis_om_obj_inst *obj_inst)
 {
 	struct gsm_bts_trx *trx;
-	struct gsm_abis_mo *mo = NULL;
 
 	switch (obj_class) {
 	case NM_OC_BTS:
-		mo = &bts->mo;
-		break;
+		return &bts->mo;
 	case NM_OC_RADIO_CARRIER:
-		if (obj_inst->trx_nr >= bts->num_trx) {
-			return NULL;
-		}
 		trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
-		mo = &trx->mo;
-		break;
+		return trx != NULL ? &trx->mo : NULL;
 	case NM_OC_BASEB_TRANSC:
-		if (obj_inst->trx_nr >= bts->num_trx) {
-			return NULL;
-		}
 		trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
-		mo = &trx->bb_transc.mo;
-		break;
+		return trx != NULL ? &trx->bb_transc.mo : NULL;
 	case NM_OC_CHANNEL:
-		if (obj_inst->trx_nr >= bts->num_trx) {
-			return NULL;
-		}
-		trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
 		if (obj_inst->ts_nr >= TRX_NR_TS)
 			return NULL;
-		mo = &trx->tsobj_inst->ts_nr.mo;
-		break;
+		trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
+		return trx != NULL ? &trx->tsobj_inst->ts_nr.mo : NULL;
 	case NM_OC_SITE_MANAGER:
-		mo = &bts->site_mgr->mo;
-		break;
+		return &bts->site_mgr->mo;
 	case NM_OC_BS11:
 		switch (obj_inst->bts_nr) {
 		case BS11_OBJ_CCLK:
-			mo = &bts->bs11.cclk.mo;
-			break;
+			return &bts->bs11.cclk.mo;
 		case BS11_OBJ_BBSIG:
-			if (obj_inst->ts_nr > bts->num_trx)
-				return NULL;
 			trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
-			mo = &trx->bs11.bbsig.mo;
-			break;
+			return trx != NULL ? &trx->bs11.bbsig.mo : NULL;
 		case BS11_OBJ_PA:
-			if (obj_inst->ts_nr > bts->num_trx)
-				return NULL;
 			trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
-			mo = &trx->bs11.pa.mo;
-			break;
-		default:
-			return NULL;
+			return trx != NULL ? &trx->bs11.pa.mo : NULL;
 		}
 		break;
 	case NM_OC_BS11_RACK:
-		mo = &bts->bs11.rack.mo;
-		break;
+		return &bts->bs11.rack.mo;
 	case NM_OC_BS11_ENVABTSE:
 		if (obj_inst->trx_nr >= ARRAY_SIZE(bts->bs11.envabtse))
 			return NULL;
-		mo = &bts->bs11.envabtseobj_inst->trx_nr.mo;
-		break;
+		return &bts->bs11.envabtseobj_inst->trx_nr.mo;
 	case NM_OC_GPRS_NSE:
-		mo = &bts->site_mgr->gprs.nse.mo;
-		break;
+		return &bts->site_mgr->gprs.nse.mo;
 	case NM_OC_GPRS_CELL:
-		mo = &bts->gprs.cell.mo;
-		break;
+		return &bts->gprs.cell.mo;
 	case NM_OC_GPRS_NSVC:
 		if (obj_inst->trx_nr >= ARRAY_SIZE(bts->site_mgr->gprs.nsvc))
 			return NULL;
-		mo = &bts->site_mgr->gprs.nsvcobj_inst->trx_nr.mo;
-		break;
+		return &bts->site_mgr->gprs.nsvcobj_inst->trx_nr.mo;
 	}
-	return mo;
+
+	return NULL;
 }
 
 /* obtain the gsm_nm_state data structure for a given object instance */