Change in osmo-bts[master]: scheduler: ensure PRIM_OP_REQUEST when adding to the queue

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Sun Oct 18 10:40:35 UTC 2020


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20693 )

Change subject: scheduler: ensure PRIM_OP_REQUEST when adding to the queue
......................................................................

scheduler: ensure PRIM_OP_REQUEST when adding to the queue

Change-Id: I709ba2394862fcb0f86484792b5f8d3b338b42cc
---
M src/common/scheduler.c
1 file changed, 2 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/src/common/scheduler.c b/src/common/scheduler.c
index e7cbc83..f0b8c31 100644
--- a/src/common/scheduler.c
+++ b/src/common/scheduler.c
@@ -651,10 +651,6 @@
 	/* get prim of current fn from queue */
 	llist_for_each_entry_safe(msg, msg2, &l1ts->dl_prims, list) {
 		l1sap = msgb_l1sap_prim(msg);
-		if (l1sap->oph.operation != PRIM_OP_REQUEST) {
-			LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong type.\n");
-			goto free_msg;
-		}
 		switch (l1sap->oph.primitive) {
 		case PRIM_PH_DATA:
 			chan_nr = l1sap->u.data.chan_nr;
@@ -806,6 +802,7 @@
 		"PH-DATA.req: chan_nr=0x%02x link_id=0x%02x\n",
 		l1sap->u.data.chan_nr, l1sap->u.data.link_id);
 
+	OSMO_ASSERT(l1sap->oph.operation == PRIM_OP_REQUEST);
 	OSMO_ASSERT(l1sap->oph.msg);
 
 	/* ignore empty frame */
@@ -827,6 +824,7 @@
 	LOGL1S(DL1P, LOGL_DEBUG, l1t, tn, -1, l1sap->u.tch.fn, "TCH.req: chan_nr=0x%02x\n",
 		l1sap->u.tch.chan_nr);
 
+	OSMO_ASSERT(l1sap->oph.operation == PRIM_OP_REQUEST);
 	OSMO_ASSERT(l1sap->oph.msg);
 
 	/* ignore empty frame */

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20693
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I709ba2394862fcb0f86484792b5f8d3b338b42cc
Gerrit-Change-Number: 20693
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201018/24e975fc/attachment.htm>


More information about the gerrit-log mailing list