fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33585 ) Change subject: scheduler: use size_t for data_len in _sched_compose_*_ind() ...................................................................... scheduler: use size_t for data_len in _sched_compose_*_ind() The payload size for some CSD channel types is bigger than what an uint8_t can represent, for instance 290 bytes for TCH/F14.4. Change-Id: Id75c55509a017d14dfab2a7b4c67e0742125a113 Related: OS#1572 --- M include/osmo-bts/scheduler_backend.h M src/common/scheduler.c 2 files changed, 17 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/include/osmo-bts/scheduler_backend.h b/include/osmo-bts/scheduler_backend.h index 83dd578..820cca7 100644 --- a/include/osmo-bts/scheduler_backend.h +++ b/include/osmo-bts/scheduler_backend.h @@ -43,14 +43,14 @@ int _sched_compose_ph_data_ind(struct l1sched_ts *l1ts, uint32_t fn, enum trx_chan_type chan, - const uint8_t *data, uint8_t data_len, + const uint8_t *data, size_t data_len, uint16_t ber10k, float rssi, int16_t ta_offs_256bits, int16_t link_qual_cb, enum osmo_ph_pres_info_type presence_info); int _sched_compose_tch_ind(struct l1sched_ts *l1ts, uint32_t fn, enum trx_chan_type chan, - const uint8_t *data, uint8_t data_len, + const uint8_t *data, size_t data_len, uint16_t ber10k, float rssi, int16_t ta_offs_256bits, int16_t link_qual_cb, uint8_t is_sub); diff --git a/src/common/scheduler.c b/src/common/scheduler.c index dc7d94f..007dd7c 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -751,7 +751,7 @@ int _sched_compose_ph_data_ind(struct l1sched_ts *l1ts, uint32_t fn, enum trx_chan_type chan, - const uint8_t *data, uint8_t data_len, + const uint8_t *data, size_t data_len, uint16_t ber10k, float rssi, int16_t ta_offs_256bits, int16_t link_qual_cb, enum osmo_ph_pres_info_type presence_info) @@ -789,7 +789,7 @@ int _sched_compose_tch_ind(struct l1sched_ts *l1ts, uint32_t fn, enum trx_chan_type chan, - const uint8_t *data, uint8_t data_len, + const uint8_t *data, size_t data_len, uint16_t ber10k, float rssi, int16_t ta_offs_256bits, int16_t link_qual_cb, uint8_t is_sub) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33585 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id75c55509a017d14dfab2a7b4c67e0742125a113 Gerrit-Change-Number: 33585 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged