[S] Change in osmo-bsc[master]: pcu_sock: check BTS type properly in pcu_info_update()

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31803 ) Change subject: pcu_sock: check BTS type properly in pcu_info_update() ...................................................................... pcu_sock: check BTS type properly in pcu_info_update() When updating the BTS information in the bsc co-located PCU, first check if the BTS has a BSC co-located PCU at all. Also check if the BTS is E1 based since those type of BTS require extra information about the E1 connection. Related: OS#5198 Change-Id: I8da26debc0e27f24fae4ee88f22f8875de13bc84 --- M src/osmo-bsc/pcu_sock.c 1 file changed, 22 insertions(+), 7 deletions(-) Approvals: 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/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 453d5a7..2d77efb 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -362,13 +362,13 @@ __attribute__((weak)) void pcu_info_update(struct gsm_bts *bts) { if (pcu_connected(bts)) { - /* In cases where the CCU is connected via an E1 line, we transmit the connection parameters for the - * PDCH before we announce the other BTS related parameters. At the moment Ericsson RBS is the only - * E1 BTS we support. */ - if (is_ericsson_bts(bts)) - pcu_tx_e1_ccu_ind(bts); - - pcu_tx_info_ind(bts); + if (bsc_co_located_pcu(bts)) { + /* In cases where the CCU is connected via an E1 line, we transmit the connection parameters for the + * PDCH before we announce the other BTS related parameters. */ + if (is_e1_bts(bts)) + pcu_tx_e1_ccu_ind(bts); + pcu_tx_info_ind(bts); + } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8da26debc0e27f24fae4ee88f22f8875de13bc84 Gerrit-Change-Number: 31803 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged