This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/19711 ) Change subject: mgcp_e1: remove unused struct member trunk->e1.line ...................................................................... mgcp_e1: remove unused struct member trunk->e1.line The struct member trunk->e1.line is never set. Also it is always possible to use e1inp_line_find() to get a pointer to the e1.line. Lets remove it. Change-Id: Id4ff52285917ce3885b8dad3a16270999c9da0aa --- M include/osmocom/mgcp/mgcp_trunk.h M src/libosmo-mgcp/mgcp_e1.c 2 files changed, 6 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved neels: Looks good to me, but someone else must approve diff --git a/include/osmocom/mgcp/mgcp_trunk.h b/include/osmocom/mgcp/mgcp_trunk.h index d99f801..1002adb 100644 --- a/include/osmocom/mgcp/mgcp_trunk.h +++ b/include/osmocom/mgcp/mgcp_trunk.h @@ -60,7 +60,6 @@ /* E1 specific */ struct { unsigned int vty_line_nr; - struct e1inp_line *line; bool ts_in_use[31]; struct osmo_i460_timeslot i460_ts[31]; } e1; diff --git a/src/libosmo-mgcp/mgcp_e1.c b/src/libosmo-mgcp/mgcp_e1.c index 3bd9a99..50a2d85 100644 --- a/src/libosmo-mgcp/mgcp_e1.c +++ b/src/libosmo-mgcp/mgcp_e1.c @@ -385,18 +385,13 @@ } /* Get E1 line */ - if (!trunk->e1.line) { - e1_line = e1inp_line_find(trunk->e1.vty_line_nr); - if (!e1_line) { - LOGPTRUNK(trunk, DE1, LOGL_DEBUG, "no such E1 line %u - check VTY config!\n", - trunk->e1.vty_line_nr); - return -EINVAL; - } - e1inp_line_bind_ops(e1_line, &dummy_e1_line_ops); - } else - e1_line = trunk->e1.line; - if (!e1_line) + e1_line = e1inp_line_find(trunk->e1.vty_line_nr); + if (!e1_line) { + LOGPTRUNK(trunk, DE1, LOGL_DEBUG, "no such E1 line %u - check VTY config!\n", + trunk->e1.vty_line_nr); return -EINVAL; + } + e1inp_line_bind_ops(e1_line, &dummy_e1_line_ops); /* Configure E1 timeslot */ rc = e1inp_ts_config_raw(&e1_line->ts[ts_nr - 1], e1_line, e1_recv_cb); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/19711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id4ff52285917ce3885b8dad3a16270999c9da0aa Gerrit-Change-Number: 19711 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier at sysmocom.de> Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200831/59acfe4c/attachment.htm>