dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/26920 )

Change subject: hbgw_hnbap: use osmo_plmn_from_bcd instead of gsm48_mcc_mnc_from_bcd ......................................................................

hbgw_hnbap: use osmo_plmn_from_bcd instead of gsm48_mcc_mnc_from_bcd

The function gsm48_mcc_mnc_from_bcd is deprecated. Lets use osmo_plmn_from_bcd instead.

Change-Id: I01406a4cf86d4f3ed162c9df55880941e54d654e --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 5b92e4e..4c3a5c0 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -398,6 +398,7 @@ struct hnb_context *hnb; HNBAP_HNBRegisterRequestIEs_t ies; int rc; + struct osmo_plmn_id plmn;

rc = hnbap_decode_hnbregisterrequesties(&ies, in); if (rc < 0) { @@ -413,7 +414,9 @@ ctx->id.sac = asn1str_to_u16(&ies.sac); ctx->id.rac = asn1str_to_u8(&ies.rac); ctx->id.cid = asn1bitstr_to_u28(&ies.cellIdentity); - gsm48_mcc_mnc_from_bcd(ies.plmNidentity.buf, &ctx->id.mcc, &ctx->id.mnc); + osmo_plmn_from_bcd(ies.plmNidentity.buf, &plmn); + ctx->id.mcc = plmn.mcc; + ctx->id.mnc = plmn.mnc;

llist_for_each_entry(hnb, &ctx->gw->hnb_list, list) { if (hnb->hnb_registered && ctx != hnb && memcmp(&ctx->id, &hnb->id, sizeof(ctx->id)) == 0) {