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

Change subject: l1sap: l1sap_chan_act(): remove unused *tp argument ......................................................................

l1sap: l1sap_chan_act(): remove unused *tp argument

Change-Id: I2030f05b55fc9370e71ff12b26ffe1142f4acfc8 --- M include/osmo-bts/l1sap.h M src/common/l1sap.c M src/common/pcu_sock.c M src/common/rsl.c M tests/handover/handover_test.c 5 files changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index 93c532f..e28a53b 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -96,7 +96,7 @@ uint32_t timestamp, bool marker);

/* channel control */ -int l1sap_chan_act(struct gsm_bts_trx *trx, uint8_t chan_nr, struct tlv_parsed *tp); +int l1sap_chan_act(struct gsm_bts_trx *trx, uint8_t chan_nr); int l1sap_chan_rel(struct gsm_bts_trx *trx, uint8_t chan_nr); int l1sap_chan_deact_sacch(struct gsm_bts_trx *trx, uint8_t chan_nr); int l1sap_chan_modify(struct gsm_bts_trx *trx, uint8_t chan_nr); diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 6ef5e3b..e9bab61 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1927,7 +1927,7 @@ return l1sap_down(trx, &l1sap); }

-int l1sap_chan_act(struct gsm_bts_trx *trx, uint8_t chan_nr, struct tlv_parsed *tp) +int l1sap_chan_act(struct gsm_bts_trx *trx, uint8_t chan_nr) { struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr); int rc; diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 94b45f3..9d0d87c 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -884,7 +884,7 @@ return -EINVAL; } if (act_req->activate) - l1sap_chan_act(trx, gsm_lchan2chan_nr(lchan), NULL); + l1sap_chan_act(trx, gsm_lchan2chan_nr(lchan)); else l1sap_chan_rel(trx, gsm_lchan2chan_nr(lchan));

diff --git a/src/common/rsl.c b/src/common/rsl.c index 5112ee5..9469894 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1941,7 +1941,7 @@ lchan->top_acch_active = false;

/* actually activate the channel in the BTS */ - rc = l1sap_chan_act(lchan->ts->trx, dch->chan_nr, &tp); + rc = l1sap_chan_act(lchan->ts->trx, dch->chan_nr); if (rc < 0) return rsl_tx_chan_act_acknack(lchan, -rc);

diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 9c9b020..231be98 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -102,12 +102,12 @@ /* create two lchans for handover */ lchan = &trx->ts[1].lchan[0]; lchan->type = GSM_LCHAN_SDCCH; - l1sap_chan_act(lchan->ts->trx, 0x09, NULL); + l1sap_chan_act(lchan->ts->trx, 0x09); lchan = &trx->ts[2].lchan[0]; lchan->type = GSM_LCHAN_TCH_F; lchan->ho.active = HANDOVER_ENABLED; lchan->ho.ref = 23; - l1sap_chan_act(lchan->ts->trx, 0x0a, NULL); + l1sap_chan_act(lchan->ts->trx, 0x0a); OSMO_ASSERT(msgb_dequeue(&trx->rsl_link->tx_list)); OSMO_ASSERT(msgb_dequeue(&trx->rsl_link->tx_list)); OSMO_ASSERT(!msgb_dequeue(&trx->rsl_link->tx_list));