August 2022 - gerrit-log - lists.osmocom.org

Change in osmocom-bb[master]: trxcon: handle l1sched_config_req via TRXCON_EV_SET_PHY_CONFIG_REQ

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28863 ) Change subject: trxcon: handle l1sched_config_req via TRXCON_EV_SET_PHY_CONFIG_REQ ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I44bbc695e8a406a7acb9c163bf223f4ea966ea12 Gerrit-Change-Number: 28863 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 08 Aug 2022 20:13:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework TRXC/TRXD cleanup logic, add trx_fsm_cleanup_cb()

by laforge

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28861 ) Change subject: trxcon: rework TRXC/TRXD cleanup logic, add trx_fsm_cleanup_cb() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic599b51067cb5a331fca521a5b46ab0a2804e499 Gerrit-Change-Number: 28861 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 08 Aug 2022 20:12:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: cosmetic: rename TRXCON_EV_SET_{PHY_}CONFIG_REQ

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28859 ) Change subject: trxcon: cosmetic: rename TRXCON_EV_SET_{PHY_}CONFIG_REQ ...................................................................... trxcon: cosmetic: rename TRXCON_EV_SET_{PHY_}CONFIG_REQ Make it clear that this event is used for setting *PHY* configuration. Change-Id: Ib70ff0352b6fcb045d0f49535dfb0d273856f3c3 --- M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trxcon_fsm.c 3 files changed, 9 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 69ac01e..4478f21 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -23,7 +23,7 @@ TRXCON_EV_FBSB_SEARCH_RES, TRXCON_EV_SET_CCCH_MODE_REQ, TRXCON_EV_SET_TCH_MODE_REQ, - TRXCON_EV_SET_CONFIG_REQ, + TRXCON_EV_SET_PHY_CONFIG_REQ, TRXCON_EV_TX_ACCESS_BURST_REQ, TRXCON_EV_DEDICATED_ESTABLISH_REQ, TRXCON_EV_DEDICATED_RELEASE_REQ, @@ -60,8 +60,8 @@ bool applied; }; -/* param of TRXCON_EV_SET_CONFIG_REQ */ -struct trxcon_param_set_config_req { +/* param of TRXCON_EV_SET_PHY_CONFIG_REQ */ +struct trxcon_param_set_phy_config_req { uint8_t timing_advance; uint8_t tx_power; }; diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 5f95e1c..28086a2 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -666,12 +666,12 @@ "Received L1CTL_PARAM_REQ (ta=%d, tx_power=%u)\n", par_req->ta, par_req->tx_power); - struct trxcon_param_set_config_req req = { + struct trxcon_param_set_phy_config_req req = { .timing_advance = par_req->ta, .tx_power = par_req->tx_power, }; - osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_SET_CONFIG_REQ, &req); + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_SET_PHY_CONFIG_REQ, &req); msgb_free(msg); return 0; diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 5329a92..053cd41 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -61,9 +61,9 @@ case TRXCON_EV_RESET_SCHED_REQ: l1sched_reset(trxcon->sched, false); break; - case TRXCON_EV_SET_CONFIG_REQ: + case TRXCON_EV_SET_PHY_CONFIG_REQ: { - const struct trxcon_param_set_config_req *req = data; + const struct trxcon_param_set_phy_config_req *req = data; if (trxcon->l1p.ta != req->timing_advance) trx_if_cmd_setta(trxcon->phyif, req->timing_advance); @@ -449,7 +449,7 @@ OSMO_VALUE_STRING(TRXCON_EV_FBSB_SEARCH_RES), OSMO_VALUE_STRING(TRXCON_EV_SET_CCCH_MODE_REQ), OSMO_VALUE_STRING(TRXCON_EV_SET_TCH_MODE_REQ), - OSMO_VALUE_STRING(TRXCON_EV_SET_CONFIG_REQ), + OSMO_VALUE_STRING(TRXCON_EV_SET_PHY_CONFIG_REQ), OSMO_VALUE_STRING(TRXCON_EV_TX_ACCESS_BURST_REQ), OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_ESTABLISH_REQ), OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_RELEASE_REQ), @@ -471,7 +471,7 @@ | S(TRXCON_EV_L2IF_FAILURE) | S(TRXCON_EV_RESET_FULL_REQ) | S(TRXCON_EV_RESET_SCHED_REQ) - | S(TRXCON_EV_SET_CONFIG_REQ), + | S(TRXCON_EV_SET_PHY_CONFIG_REQ), .allstate_action = &trxcon_allstate_action, .timer_cb = &trxcon_timer_cb, }; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib70ff0352b6fcb045d0f49535dfb0d273856f3c3 Gerrit-Change-Number: 28859 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: cosmetic: rename TRXCON_EV_{L1IF->PHYIF}_FAILURE

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28860 ) Change subject: trxcon: cosmetic: rename TRXCON_EV_{L1IF->PHYIF}_FAILURE ...................................................................... trxcon: cosmetic: rename TRXCON_EV_{L1IF->PHYIF}_FAILURE Basically, everything below layer 2 is layer 1. Let's clarify the domain of TRXCON_EV_L1IF_FAILURE by saying 'PHYIF' instead of 'L1IF'. Change-Id: I9159492a04bc071b7b04d9b88d4e6fd13cc3af31 --- M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/trx_if.c M src/host/trxcon/src/trxcon_fsm.c 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 4478f21..eed3d61 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -13,7 +13,7 @@ }; enum trxcon_fsm_events { - TRXCON_EV_L1IF_FAILURE, + TRXCON_EV_PHYIF_FAILURE, TRXCON_EV_L2IF_FAILURE, TRXCON_EV_RESET_FULL_REQ, TRXCON_EV_RESET_SCHED_REQ, diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index d51c9d1..af879c1 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -712,7 +712,7 @@ } /* Allocate a new dedicated state machine */ - trx->fi = osmo_fsm_inst_alloc_child(&trx_fsm, trxcon->fi, TRXCON_EV_L1IF_FAILURE); + trx->fi = osmo_fsm_inst_alloc_child(&trx_fsm, trxcon->fi, TRXCON_EV_PHYIF_FAILURE); if (trx->fi == NULL) { LOGPFSML(trxcon->fi, LOGL_ERROR, "Failed to allocate an instance " "of FSM '%s'\n", trx_fsm.name); diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 053cd41..3c30565 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -45,7 +45,7 @@ struct trxcon_inst *trxcon = fi->priv; switch (event) { - case TRXCON_EV_L1IF_FAILURE: + case TRXCON_EV_PHYIF_FAILURE: case TRXCON_EV_L2IF_FAILURE: LOGPFSML(fi, LOGL_NOTICE, "Event %s is not handled\n", osmo_fsm_event_name(&trxcon_fsm_def, event)); @@ -439,7 +439,7 @@ }; static const struct value_string trxcon_fsm_event_names[] = { - OSMO_VALUE_STRING(TRXCON_EV_L1IF_FAILURE), + OSMO_VALUE_STRING(TRXCON_EV_PHYIF_FAILURE), OSMO_VALUE_STRING(TRXCON_EV_L2IF_FAILURE), OSMO_VALUE_STRING(TRXCON_EV_RESET_FULL_REQ), OSMO_VALUE_STRING(TRXCON_EV_RESET_SCHED_REQ), @@ -467,7 +467,7 @@ .num_states = ARRAY_SIZE(trxcon_fsm_states), .log_subsys = DAPP, .event_names = trxcon_fsm_event_names, - .allstate_event_mask = S(TRXCON_EV_L1IF_FAILURE) + .allstate_event_mask = S(TRXCON_EV_PHYIF_FAILURE) | S(TRXCON_EV_L2IF_FAILURE) | S(TRXCON_EV_RESET_FULL_REQ) | S(TRXCON_EV_RESET_SCHED_REQ) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9159492a04bc071b7b04d9b88d4e6fd13cc3af31 Gerrit-Change-Number: 28860 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: improve L1CTL connection related logging

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28864 ) Change subject: trxcon: improve L1CTL connection related logging ...................................................................... trxcon: improve L1CTL connection related logging * l1ctl_client_conn_close(): log "Closing L1CTL connection"; * l1ctl_client_read_cb(): more precise logging, use strerror(). Change-Id: Ie932513f93fd7f1a5f5e70f4d78235551f7599c8 Related: OS#5599 --- M src/host/trxcon/src/l1ctl_server.c 1 file changed, 11 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/trxcon/src/l1ctl_server.c b/src/host/trxcon/src/l1ctl_server.c index cf98c6f..bfbd997 100644 --- a/src/host/trxcon/src/l1ctl_server.c +++ b/src/host/trxcon/src/l1ctl_server.c @@ -50,12 +50,16 @@ /* Attempt to read from socket */ rc = read(ofd->fd, &len, L1CTL_MSG_LEN_FIELD); - if (rc < L1CTL_MSG_LEN_FIELD) { - LOGP_CLI(client, DL1D, LOGL_NOTICE, - "L1CTL server has lost connection (id=%u)\n", - client->id); - if (rc >= 0) + if (rc != L1CTL_MSG_LEN_FIELD) { + if (rc <= 0) { + LOGP_CLI(client, DL1D, LOGL_NOTICE, + "L1CTL connection error: read() failed (rc=%d): %s\n", + rc, strerror(errno)); + } else { + LOGP_CLI(client, DL1D, LOGL_NOTICE, + "L1CTL connection error: short read\n"); rc = -EIO; + } l1ctl_client_conn_close(client); return rc; } @@ -199,6 +203,8 @@ { struct l1ctl_server *server = client->server; + LOGP_CLI(client, DL1C, LOGL_NOTICE, "Closing L1CTL connection\n"); + if (server->cfg->conn_close_cb != NULL) server->cfg->conn_close_cb(client); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie932513f93fd7f1a5f5e70f4d78235551f7599c8 Gerrit-Change-Number: 28864 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: improve L1CTL connection related logging

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28864 ) Change subject: trxcon: improve L1CTL connection related logging ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie932513f93fd7f1a5f5e70f4d78235551f7599c8 Gerrit-Change-Number: 28864 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 08 Aug 2022 20:11:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: cosmetic: rename TRXCON_EV_{L1IF->PHYIF}_FAILURE

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28860 ) Change subject: trxcon: cosmetic: rename TRXCON_EV_{L1IF->PHYIF}_FAILURE ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9159492a04bc071b7b04d9b88d4e6fd13cc3af31 Gerrit-Change-Number: 28860 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 08 Aug 2022 20:11:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: cosmetic: rename TRXCON_EV_SET_{PHY_}CONFIG_REQ

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28859 ) Change subject: trxcon: cosmetic: rename TRXCON_EV_SET_{PHY_}CONFIG_REQ ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib70ff0352b6fcb045d0f49535dfb0d273856f3c3 Gerrit-Change-Number: 28859 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 08 Aug 2022 20:10:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: bts_trx_vty: prefix bb_trxc mo with [Virtual] for ericsson BTS

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28895 ) Change subject: bts_trx_vty: prefix bb_trxc mo with [Virtual] for ericsson BTS ...................................................................... bts_trx_vty: prefix bb_trxc mo with [Virtual] for ericsson BTS The OM2000 model does not have a separate bb_transc MO, however for compatibilty reasons we have a virtual MO that just mirrors the state of the TRX mo. We should mark it as [Virtual] in show trx to reflect this to the user. Change-Id: I0f5501f6fbc7ce6d5457676b16c7f93f70db5763 Related: OS#5101 --- M src/osmo-bsc/bts_trx_vty.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts_trx_vty.c b/src/osmo-bsc/bts_trx_vty.c index bd13a05..ef4b96d 100644 --- a/src/osmo-bsc/bts_trx_vty.c +++ b/src/osmo-bsc/bts_trx_vty.c @@ -738,8 +738,10 @@ net_dump_nmstate(vty, &trx->mo.nm_state); if (print_rsl) vty_out(vty, " RSL State: %s%s", trx->rsl_link_primary? "connected" : "disconnected", VTY_NEWLINE); - vty_out(vty, " Baseband Transceiver NM State: "); - net_dump_nmstate(vty, &trx->bb_transc.mo.nm_state); + + vty_out(vty, " %sBaseband Transceiver NM State: ", is_ericsson_bts(trx->bts) ? "[Virtual] " : ""); + net_dump_nmstate(vty, &trx->bb_transc.mo.nm_state); + if (is_ipaccess_bts(trx->bts)) { vty_out(vty, " ip.access stream ID: 0x%02x ", trx->rsl_tei_primary); e1isl_dump_vty_tcp(vty, trx->rsl_link_primary); 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0f5501f6fbc7ce6d5457676b16c7f93f70db5763 Gerrit-Change-Number: 28895 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: abis_om2000: om2k_trx_s_done_onenter() does not send signal

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28916 ) Change subject: abis_om2000: om2k_trx_s_done_onenter() does not send signal ...................................................................... abis_om2000: om2k_trx_s_done_onenter() does not send signal the function om2k_trx_s_done_onenter() updates the administrative state of the TRX oml MO but it does not notify the update to other entities using S_NM_STATECHG Change-Id: Iabf9f3a1a345c5d53d9a4d02fa2d6d13ddfd86ae Related: OS#5634 --- M src/osmo-bsc/abis_om2000.c 1 file changed, 14 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index 14f027d..63b2a63 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -2226,11 +2226,23 @@ static void om2k_trx_s_done_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct om2k_trx_fsm_priv *otfp = fi->priv; + struct nm_statechg_signal_data nsd; + struct gsm_bts_trx *trx = otfp->trx; + + memset(&nsd, 0, sizeof(nsd)); + + nsd.bts = trx->bts; + nsd.obj = trx; + nsd.old_state = trx->mo.nm_state; + nsd.new_state = trx->mo.nm_state; + nsd.om2k_mo = &trx->rbs2000.trxc.om2k_mo.addr; /* See e1_config:bts_isdn_sign_link() / OS#4914 */ - otfp->trx->mo.nm_state.administrative = NM_STATE_UNLOCKED; + nsd.new_state.administrative = NM_STATE_UNLOCKED; + trx->mo.nm_state.administrative = nsd.new_state.administrative; + osmo_signal_dispatch(SS_NM, S_NM_STATECHG, &nsd); - abis_om2000_fsm_transc_becomes_enabled(otfp->trx); + abis_om2000_fsm_transc_becomes_enabled(trx); if (fi->proc.parent) osmo_fsm_inst_dispatch(fi->proc.parent, otfp->done_event, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iabf9f3a1a345c5d53d9a4d02fa2d6d13ddfd86ae Gerrit-Change-Number: 28916 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2022