pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32265 )
Change subject: pcu_sock: Drop bts_sm pointer ......................................................................
pcu_sock: Drop bts_sm pointer
It is not really needed since the object is global.
Change-Id: I17f7c42dc9f38485dbcc8595a3a3dbf5a80a7961 --- M src/common/pcu_sock.c 1 file changed, 12 insertions(+), 3 deletions(-)
Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified
diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 7d0c796..daa1a57 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -947,7 +947,6 @@ */
struct pcu_sock_state { - struct gsm_bts_sm *bts_sm; struct osmo_fd listen_bfd; /* fd for listen socket */ struct osmo_fd conn_bfd; /* fd for connection to lcr */ struct llist_head upqueue; /* queue for sending messages */ @@ -990,7 +989,7 @@ unsigned int tn;
/* FIXME: allow multiple BTS */ - bts = llist_entry(state->bts_sm->bts_list.next, struct gsm_bts, list); + bts = llist_entry(g_bts_sm->bts_list.next, struct gsm_bts, list);
LOGP(DPCU, LOGL_NOTICE, "PCU socket has LOST connection\n"); oml_tx_failure_event_rep(&bts->gprs.cell.mo, NM_SEVER_MAJOR, OSMO_EVT_PCU_VERS, @@ -1183,7 +1182,6 @@ return -ENOMEM;
INIT_LLIST_HEAD(&state->upqueue); - state->bts_sm = g_bts_sm; state->conn_bfd.fd = -1;
bfd = &state->listen_bfd;