April 2022 - gerrit-log - lists.osmocom.org

Change in osmo-pcu[master]: tests/llc: Add test_llc_codel

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27643 ) Change subject: tests/llc: Add test_llc_codel ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9c87b65496a6fe0187a1bc9f3419e2d7269e66f0 Gerrit-Change-Number: 27643 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 05 Apr 2022 11:16:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-pcu[master]: tests/llc: Add test_llc_meta_pdu_life_expire

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27642 ) Change subject: tests/llc: Add test_llc_meta_pdu_life_expire ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7ba6be32778e2c2b22723db10fa66655812c8452 Gerrit-Change-Number: 27642 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 05 Apr 2022 11:16:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-pcu[master]: llc_queue: Refactor to handle codel_state per prio queue internally

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27641 ) Change subject: llc_queue: Refactor to handle codel_state per prio queue internally ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2bce2e82ab6389d8a70130a5c26a966a316b0fa4 Gerrit-Change-Number: 27641 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 05 Apr 2022 11:16:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-pcu[master]: pdch is_enabled: Use API getter instead of accessing field directly

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27637 ) Change subject: pdch is_enabled: Use API getter instead of accessing field directly ...................................................................... pdch is_enabled: Use API getter instead of accessing field directly Change-Id: I389f42ef2e95d28643ec51771e46d083d4e20057 --- M src/gprs_bssgp_pcu.c M src/pcu_l1_if.cpp 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c index bf82fc4..8fd6d85 100644 --- a/src/gprs_bssgp_pcu.c +++ b/src/gprs_bssgp_pcu.c @@ -782,7 +782,7 @@ for (ts_no = 0; ts_no < ARRAY_SIZE(trx->pdch); ++ts_no) { const struct gprs_rlcmac_pdch *pdch = &trx->pdch[ts_no]; - if (pdch->m_is_enabled) + if (pdch_is_enabled(pdch)) num_pdch += 1; } } diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index d0698d9..221a1f7 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -540,7 +540,7 @@ /* Make sure PDCH time-slot is enabled */ pdch = &bts->trx[trx].pdch[ts]; - if (!pdch->m_is_enabled) + if (!pdch_is_enabled(pdch)) return -EAGAIN; /* If there's no TBF attached to this PDCH, we can skip Tx of PTCCH -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I389f42ef2e95d28643ec51771e46d083d4e20057 Gerrit-Change-Number: 27637 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-pcu[master]: llc_queue: Refactor to handle codel_state per prio queue internally

by pespin

Hello osmith, Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/27641 to look at the new patch set (#3). Change subject: llc_queue: Refactor to handle codel_state per prio queue internally ...................................................................... llc_queue: Refactor to handle codel_state per prio queue internally A CoDel state per prio queue is needed, otherwise the sojourn time state is not properly reset when a high prio packet is dequeued. If we have a global codel state shared for all prio queues of an MS, then basically high prio (GMM) packets will "never" be dropped because they are handled/dequeued way quicker, so it's sojourn time will be below the threshold most probably, stopping the "dropping" state for the rest of lower prio packets. The handling of different codel states is moved from MS object to the llc_queue, also offloading already loaded dl_tbf.cpp in the process. This will also allow in the future setting different CoDel parameters for different priority queues if needed. Tests need to be adapted since now the CoDel and PDU lifetime are incorporated into the llc_queue_dequeue(). Also because dequeue now also accesses related MS fields. Related: OS#5508 Change-Id: I2bce2e82ab6389d8a70130a5c26a966a316b0fa4 --- M src/gprs_ms.c M src/gprs_ms.h M src/llc.c M src/llc.h M src/tbf_dl.cpp M src/tbf_dl.h M tests/llc/LlcTest.cpp 7 files changed, 207 insertions(+), 178 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/41/27641/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2bce2e82ab6389d8a70130a5c26a966a316b0fa4 Gerrit-Change-Number: 27641 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: doc: rsl: Fix description of 'IP Connection Statistics' IE

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27645 ) Change subject: doc: rsl: Fix description of 'IP Connection Statistics' IE ...................................................................... doc: rsl: Fix description of 'IP Connection Statistics' IE Related: SYS#5915 Change-Id: Ic524d73a0c47fde528b78f9dfe7b72b7286550e1 --- M doc/manuals/abis/rsl.adoc 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/doc/manuals/abis/rsl.adoc b/doc/manuals/abis/rsl.adoc index 8e2ead9..ab1d5e7 100644 --- a/doc/manuals/abis/rsl.adoc +++ b/doc/manuals/abis/rsl.adoc @@ -953,8 +953,8 @@ This information element contains statistics about the RTP connection. -It is encoded as 29 bytes, with the first byte as IEI and 28 bytes -fixed-length payload encoded as follows: +It is encoded as 30 bytes, with the first byte as IEI, the second byte as length +(=28), and 28 bytes fixed-length payload encoded as follows: .A-bis/IP Connection Statistics [options="header",width="60%",cols="15%,15%,70%"] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic524d73a0c47fde528b78f9dfe7b72b7286550e1 Gerrit-Change-Number: 27645 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-pcu[master]: gprs_ms_storage: MS always has non NULL ms->bts

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27636 ) Change subject: gprs_ms_storage: MS always has non NULL ms->bts ...................................................................... gprs_ms_storage: MS always has non NULL ms->bts An MS object is always attached to a BTS through its lifespan. Change-Id: Ie9ed9341a82b5edaee09da9156e95a616088f950 --- M src/gprs_ms_storage.cpp 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved diff --git a/src/gprs_ms_storage.cpp b/src/gprs_ms_storage.cpp index aa0fc9e..b98104d 100644 --- a/src/gprs_ms_storage.cpp +++ b/src/gprs_ms_storage.cpp @@ -28,8 +28,7 @@ static void ms_storage_ms_idle_cb(struct GprsMs *ms) { llist_del(&ms->list); - if (ms->bts) - bts_stat_item_add(ms->bts, STAT_MS_PRESENT, -1); + bts_stat_item_add(ms->bts, STAT_MS_PRESENT, -1); if (ms_is_idle(ms)) talloc_free(ms); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie9ed9341a82b5edaee09da9156e95a616088f950 Gerrit-Change-Number: 27636 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-pcu[master]: llc: schedule frames to MS based on SAPI priority

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27627 ) Change subject: llc: schedule frames to MS based on SAPI priority ...................................................................... llc: schedule frames to MS based on SAPI priority The CoDel state is still applied globally, which could cause higher prio messages (GMM) to clear dropping state (since those are left for a smaller period of time inside the queue). CoDel state will be moved per prio-queue in a follow-up patch. Related: OS#5508 Related: SYS#5908 Change-Id: Ie8bd91eeac4fa7487d4f11b808dea95737041c7e --- M src/llc.c M src/llc.h 2 files changed, 90 insertions(+), 37 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/llc.c b/src/llc.c index 700585a..c8d74d8 100644 --- a/src/llc.c +++ b/src/llc.c @@ -96,19 +96,40 @@ void llc_queue_init(struct gprs_llc_queue *q) { - INIT_LLIST_HEAD(&q->queue); + unsigned int i; + q->queue_size = 0; q->queue_octets = 0; q->avg_queue_delay = 0; + for (i = 0; i < ARRAY_SIZE(q->queue); i++) + INIT_LLIST_HEAD(&q->queue[i]); } +static enum gprs_llc_queue_prio llc_sapi2prio(uint8_t sapi) +{ + switch (sapi) { + case 1: + return LLC_QUEUE_PRIO_GMM; + case 2: + case 7: + case 8: + return LLC_QUEUE_PRIO_TOM_SMS; + default: + return LLC_QUEUE_PRIO_OTHER; + } +} + void llc_queue_enqueue(struct gprs_llc_queue *q, struct msgb *llc_msg, const struct timespec *expire_time) { struct MetaInfo *meta_storage; + struct gprs_llc_hdr *llc_hdr = (struct gprs_llc_hdr *)msgb_data(llc_msg); + enum gprs_llc_queue_prio prio; osmo_static_assert(sizeof(*meta_storage) <= sizeof(llc_msg->cb), info_does_not_fit); + prio = llc_sapi2prio(llc_hdr->sapi); + q->queue_size += 1; q->queue_octets += msgb_length(llc_msg); @@ -116,17 +137,20 @@ osmo_clock_gettime(CLOCK_MONOTONIC, &meta_storage->recv_time); meta_storage->expire_time = *expire_time; - msgb_enqueue(&q->queue, llc_msg); + msgb_enqueue(&q->queue[prio], llc_msg); } void llc_queue_clear(struct gprs_llc_queue *q, struct gprs_rlcmac_bts *bts) { struct msgb *msg; + unsigned int i; - while ((msg = msgb_dequeue(&q->queue))) { - if (bts) - bts_do_rate_ctr_inc(bts, CTR_LLC_FRAME_DROPPED); - msgb_free(msg); + for (i = 0; i < ARRAY_SIZE(q->queue); i++) { + while ((msg = msgb_dequeue(&q->queue[i]))) { + if (bts) + bts_do_rate_ctr_inc(bts, CTR_LLC_FRAME_DROPPED); + msgb_free(msg); + } } q->queue_size = 0; @@ -137,51 +161,53 @@ { struct msgb *msg, *msg1 = NULL, *msg2 = NULL; struct llist_head new_queue; + unsigned int i; size_t queue_size = 0; size_t queue_octets = 0; INIT_LLIST_HEAD(&new_queue); - while (1) { - if (msg1 == NULL) - msg1 = msgb_dequeue(&q->queue); + for (i = 0; i < ARRAY_SIZE(q->queue); i++) { + while (1) { + if (msg1 == NULL) + msg1 = msgb_dequeue(&q->queue[i]); - if (msg2 == NULL) - msg2 = msgb_dequeue(&o->queue); + if (msg2 == NULL) + msg2 = msgb_dequeue(&o->queue[i]); - if (msg1 == NULL && msg2 == NULL) - break; + if (msg1 == NULL && msg2 == NULL) + break; - if (msg1 == NULL) { - msg = msg2; - msg2 = NULL; - } else if (msg2 == NULL) { - msg = msg1; - msg1 = NULL; - } else { - const struct MetaInfo *mi1 = (struct MetaInfo *)&msg1->cb[0]; - const struct MetaInfo *mi2 = (struct MetaInfo *)&msg2->cb[0]; - - if (timespeccmp(&mi2->recv_time, &mi1->recv_time, >)) { + if (msg1 == NULL) { + msg = msg2; + msg2 = NULL; + } else if (msg2 == NULL) { msg = msg1; msg1 = NULL; } else { - msg = msg2; - msg2 = NULL; + const struct MetaInfo *mi1 = (struct MetaInfo *)&msg1->cb[0]; + const struct MetaInfo *mi2 = (struct MetaInfo *)&msg2->cb[0]; + + if (timespeccmp(&mi2->recv_time, &mi1->recv_time, >)) { + msg = msg1; + msg1 = NULL; + } else { + msg = msg2; + msg2 = NULL; + } } + + msgb_enqueue(&new_queue, msg); + queue_size += 1; + queue_octets += msgb_length(msg); } - msgb_enqueue(&new_queue, msg); - queue_size += 1; - queue_octets += msgb_length(msg); + OSMO_ASSERT(llist_empty(&q->queue[i])); + OSMO_ASSERT(llist_empty(&o->queue[i])); + llist_splice_init(&new_queue, &q->queue[i]); } - OSMO_ASSERT(llist_empty(&q->queue)); - OSMO_ASSERT(llist_empty(&o->queue)); - o->queue_size = 0; o->queue_octets = 0; - - llist_splice_init(&new_queue, &q->queue); q->queue_size = queue_size; q->queue_octets = queue_octets; } @@ -193,9 +219,13 @@ struct msgb *msg; struct timespec *tv, tv_now, tv_result; uint32_t lifetime; + unsigned int i; const struct MetaInfo *meta_storage; - msg = msgb_dequeue(&q->queue); + for (i = 0; i < ARRAY_SIZE(q->queue); i++) { + if ((msg = msgb_dequeue(&q->queue[i]))) + break; + } if (!msg) return NULL; diff --git a/src/llc.h b/src/llc.h index bd542c0..adfab65 100644 --- a/src/llc.h +++ b/src/llc.h @@ -1,4 +1,4 @@ -/* +/* 3GPP TS 44.064 * Copyright (C) 2013 by Holger Hans Peter Freyther * Copyright (C) 2022 by by Sysmocom s.f.m.c. GmbH * @@ -23,13 +23,30 @@ #include <string.h> #include <time.h> +#include <osmocom/core/endian.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/msgb.h> +#include <osmocom/core/endian.h> #define LLC_MAX_LEN 1543 struct gprs_rlcmac_bts; +struct gprs_llc_hdr { +#if OSMO_IS_LITTLE_ENDIAN + union { /* 5.2, 6.2.0 */ + uint8_t address; + uint8_t sapi:4, unused:2, c_r:1, pd:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + union { + uint8_t address; + uint8_t pd:1, c_r:1, unused:2, sapi:4; +#endif + }; + uint8_t control[0]; +} __attribute__ ((packed)); + /** * I represent the LLC data to a MS */ @@ -87,11 +104,17 @@ /** * I store the LLC frames that come from the SGSN. */ +enum gprs_llc_queue_prio { /* lowest value has highest prio */ + LLC_QUEUE_PRIO_GMM = 0, /* SAPI 1 */ + LLC_QUEUE_PRIO_TOM_SMS, /* SAPI 2,7,8 */ + LLC_QUEUE_PRIO_OTHER, /* Other SAPIs */ + _LLC_QUEUE_PRIO_SIZE /* used to calculate size of enum */ +}; struct gprs_llc_queue { uint32_t avg_queue_delay; /* Average delay of data going through the queue */ size_t queue_size; size_t queue_octets; - struct llist_head queue; /* queued LLC DL data */ + struct llist_head queue[_LLC_QUEUE_PRIO_SIZE]; /* queued LLC DL data. See enum gprs_llc_queue_prio. */ }; void llc_queue_calc_pdu_lifetime(struct gprs_rlcmac_bts *bts, const uint16_t pdu_delay_csec, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie8bd91eeac4fa7487d4f11b808dea95737041c7e Gerrit-Change-Number: 27627 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-pcu[master]: ms: validate codel enabled against proper define

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27634 ) Change subject: ms: validate codel enabled against proper define ...................................................................... ms: validate codel enabled against proper define This is a cosmetic change, since LLC_CODEL_DISABLE is defined as 0. It clarifies though the meaning of the if condition. Change-Id: I7c4bda5977a94c2aaf01ca368570f80fd6ebae00 --- M src/gprs_ms.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved lynxis lazus: Looks good to me, approved diff --git a/src/gprs_ms.c b/src/gprs_ms.c index c10eda7..3167dee 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -119,7 +119,7 @@ if (ms->bts) codel_interval = the_pcu->vty.llc_codel_interval_msec; - if (codel_interval) { + if (codel_interval != LLC_CODEL_DISABLE) { if (codel_interval == LLC_CODEL_USE_DEFAULT) codel_interval = GPRS_CODEL_SLOW_INTERVAL_MS; ms->codel_state = talloc(ms, struct gprs_codel); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7c4bda5977a94c2aaf01ca368570f80fd6ebae00 Gerrit-Change-Number: 27634 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-pcu[master]: ms: Remove unneeded bts!=NULL check

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27635 ) Change subject: ms: Remove unneeded bts!=NULL check ...................................................................... ms: Remove unneeded bts!=NULL check The ms_alloc function is expected to always have a proper bts object passed, since an ms is always attached at a BTS. Change-Id: I10b3c94dcb2fed4bff40b1ab7ea455175cf77ce4 --- M src/gprs_ms.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved diff --git a/src/gprs_ms.c b/src/gprs_ms.c index 3167dee..63f454f 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -90,6 +90,7 @@ struct GprsMs *ms_alloc(struct gprs_rlcmac_bts *bts, uint32_t tlli) { struct GprsMs *ms = talloc_zero(tall_pcu_ctx, struct GprsMs); + OSMO_ASSERT(bts); talloc_set_destructor(ms, ms_talloc_destructor); @@ -116,8 +117,7 @@ ms_set_mode(ms, GPRS); - if (ms->bts) - codel_interval = the_pcu->vty.llc_codel_interval_msec; + codel_interval = the_pcu->vty.llc_codel_interval_msec; if (codel_interval != LLC_CODEL_DISABLE) { if (codel_interval == LLC_CODEL_USE_DEFAULT) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I10b3c94dcb2fed4bff40b1ab7ea455175cf77ce4 Gerrit-Change-Number: 27635 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022