dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34104 )

Change subject: pcu_sock: get rid of fn parameter in pcu_tx_pch_data_cnf ......................................................................

pcu_sock: get rid of fn parameter in pcu_tx_pch_data_cnf

The function pcu_tx_pch_data_cnf() gets a parameter fn (frame number). This parameter is then used to populate the member fn in gsm_pcu_if_data_cnf_dt of the PCUIF protocol. However, the PCU only uses this parameter for logging and nothing else. Hence it it is not needed and we can remove it.

Related: OS#5927 Depends: osmo-pcu.git I35bc99eaec5d0287ae3916bc668f0babaddfd6ce Change-Id: Id1c8fa77725129ec2ea7e92e1df493f35a277659 --- M include/osmo-bts/pcu_if.h M src/common/paging.c M src/common/pcu_sock.c 3 files changed, 20 insertions(+), 4 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/04/34104/1

diff --git a/include/osmo-bts/pcu_if.h b/include/osmo-bts/pcu_if.h index 59e1d3d..4b37560 100644 --- a/include/osmo-bts/pcu_if.h +++ b/include/osmo-bts/pcu_if.h @@ -23,7 +23,7 @@ int pcu_tx_time_ind(uint32_t fn); int pcu_tx_interf_ind(const struct gsm_bts_trx *trx, uint32_t fn); int pcu_tx_pag_req(const uint8_t *identity_lv, uint8_t chan_needed); -int pcu_tx_pch_data_cnf(uint32_t fn, uint32_t msg_id); +int pcu_tx_pch_data_cnf(uint32_t msg_id); int pcu_tx_susp_req(struct gsm_lchan *lchan, uint32_t tlli, const uint8_t *ra_id, uint8_t cause); int pcu_sock_send(struct msgb *msg);

diff --git a/src/common/paging.c b/src/common/paging.c index ebfb84b..9738bd6 100644 --- a/src/common/paging.c +++ b/src/common/paging.c @@ -734,7 +734,7 @@ GSM_MACBLOCK_LEN); /* send a confirmation back (if required) */ if (pr[num_pr]->u.macblock.confirm) - pcu_tx_pch_data_cnf(gt->fn, pr[num_pr]->u.macblock.msg_id); + pcu_tx_pch_data_cnf(pr[num_pr]->u.macblock.msg_id); talloc_free(pr[num_pr]); return GSM_MACBLOCK_LEN; } diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index ad645a0..67958f6 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -618,7 +618,7 @@ return pcu_sock_send(msg); }

-int pcu_tx_pch_data_cnf(uint32_t fn, uint32_t msg_id) +int pcu_tx_pch_data_cnf(uint32_t msg_id) { struct gsm_bts *bts; struct msgb *msg; @@ -636,7 +636,6 @@ pcu_prim->u.data_cnf_dt = (struct gsm_pcu_if_data_cnf_dt) { .sapi = PCU_IF_SAPI_PCH_DT, .msg_id = msg_id, - .fn = fn, };

return pcu_sock_send(msg);