fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31599 ) Change subject: paging_add_imm_ass(): remove meaningless from_pcu argument ...................................................................... paging_add_imm_ass(): remove meaningless from_pcu argument A request to send an Immediate Assignment over the PCH (not AGCH) is always coming from the PCU. It's used for DL TBF assignment. Change-Id: If4b0aa01532ab65b96201ff8829e724c67df6993 --- M include/osmo-bts/paging.h M src/common/paging.c M src/common/pcu_sock.c 3 files changed, 18 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/osmo-bts/paging.h b/include/osmo-bts/paging.h index ef1fc93..fb50323 100644 --- a/include/osmo-bts/paging.h +++ b/include/osmo-bts/paging.h @@ -36,8 +36,8 @@ const uint8_t *identity_lv, uint8_t chan_needed); /* Add an IMM.ASS message to the paging queue */ -int paging_add_imm_ass(struct paging_state *ps, const uint8_t *data, - uint8_t len, bool from_pcu); +int paging_add_imm_ass(struct paging_state *ps, + const uint8_t *data, uint8_t len); /* generate paging message for given gsm time */ int paging_gen_msg(struct paging_state *ps, uint8_t *out_buf, struct gsm_time *gt, diff --git a/src/common/paging.c b/src/common/paging.c index 54d7263..26ba9b0 100644 --- a/src/common/paging.c +++ b/src/common/paging.c @@ -268,8 +268,8 @@ } /* Add an IMM.ASS message to the paging queue */ -int paging_add_imm_ass(struct paging_state *ps, const uint8_t *data, - uint8_t len, bool from_pcu) +int paging_add_imm_ass(struct paging_state *ps, + const uint8_t *data, uint8_t len) { struct llist_head *group_q; struct paging_record *pr; @@ -277,7 +277,7 @@ check_congestion(ps); - if (ps->cs_priority_active && from_pcu) { + if (ps->cs_priority_active) { LOGP(DPAG, LOGL_NOTICE, "Dropping paging for PS, queue congested (%u)\n", ps->num_paging); rate_ctr_inc2(ps->bts->ctrs, BTS_CTR_PAGING_DROP_PS); diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 8f8b3af..bdf5958 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -681,7 +681,7 @@ switch (data_req->sapi) { case PCU_IF_SAPI_PCH: - paging_add_imm_ass(bts->paging_state, data_req->data, data_req->len, true); + paging_add_imm_ass(bts->paging_state, data_req->data, data_req->len); break; case PCU_IF_SAPI_AGCH: msg = msgb_alloc(data_req->len, "pcu_agch"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If4b0aa01532ab65b96201ff8829e724c67df6993 Gerrit-Change-Number: 31599 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier@sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: pespin <pespin@sysmocom.de> Gerrit-MessageType: merged