fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34431?usp=email ) Change subject: oml: oml_tx_attr_resp(): pass *mo to handle_attrs_{bts,trx}() ...................................................................... oml: oml_tx_attr_resp(): pass *mo to handle_attrs_{bts,trx}() Change-Id: I78555d7226afd0c25efc100d95642634323a7b95 --- M src/common/oml.c 1 file changed, 17 insertions(+), 14 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/common/oml.c b/src/common/oml.c index 4380258..d1b7e5d 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -217,18 +217,15 @@ /* Handle a list of attributes requested by the BSC, compose * TRX-specific Get Attribute Response IE as per 9.4.64. */ -static inline int handle_attrs_trx(struct msgb *out_msg, const struct gsm_bts_trx *trx, +static inline int handle_attrs_trx(struct msgb *out_msg, + const struct gsm_abis_mo *mo, const uint8_t *attr, uint16_t attr_len) { + const struct gsm_bts_trx *trx = container_of(mo, struct gsm_bts_trx, bb_transc.mo); uint8_t num_unsupported = 0; uint8_t *buf; int i; - if (!trx) { - LOGP(DOML, LOGL_ERROR, "%s: O&M Get Attributes for unknown TRX\n", gsm_trx_name(trx)); - return -NM_NACK_TRXNR_UNKN; - } - for (i = 0; i < attr_len; i++) { switch (attr[i]) { case NM_ATT_SW_CONFIG: @@ -253,18 +250,15 @@ /* Handle a list of attributes requested by the BSC, compose * BTS-specific Get Attribute Response IE as per 9.4.64. */ -static inline int handle_attrs_bts(struct msgb *out_msg, const struct gsm_bts *bts, +static inline int handle_attrs_bts(struct msgb *out_msg, + const struct gsm_abis_mo *mo, const uint8_t *attr, uint16_t attr_len) { + const struct gsm_bts *bts = container_of(mo, struct gsm_bts, mo); uint8_t num_unsupported = 0; uint8_t *buf; int i; - if (!bts) { - LOGP(DOML, LOGL_ERROR, "O&M Get Attributes for unknown BTS\n"); - return -NM_NACK_BTSNR_UNKN; - } - for (i = 0; i < attr_len; i++) { switch (attr[i]) { case NM_ATT_SW_CONFIG: @@ -303,10 +297,10 @@ switch (mo->obj_class) { case NM_OC_BTS: - rc = handle_attrs_bts(nmsg, mo->bts, attr, attr_len); + rc = handle_attrs_bts(nmsg, mo, attr, attr_len); break; case NM_OC_BASEB_TRANSC: - rc = handle_attrs_trx(nmsg, gsm_bts_trx_num(mo->bts, mo->obj_inst.trx_nr), attr, attr_len); + rc = handle_attrs_trx(nmsg, mo, attr, attr_len); break; default: LOGP(DOML, LOGL_ERROR, "%s: Unsupported MO class in Get Attribute Response\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34431?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I78555d7226afd0c25efc100d95642634323a7b95 Gerrit-Change-Number: 34431 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: osmith &lt;osmith(a)sysmocom.de&gt; Gerrit-Reviewer: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-MessageType: merged