Change in osmo-pcu[master]: sched: Fix sending GSMTAP DL data blocks with unset USF

[pespin]

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/21174 )


Change subject: sched: Fix sending GSMTAP DL data blocks with unset USF
......................................................................

sched: Fix sending GSMTAP DL data blocks with unset USF

Change-Id: Ib5ceb83a85b517ee9bf2c59cf27fe818373abe60
---
M src/gprs_rlcmac_sched.cpp
1 file changed, 7 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/74/21174/1

diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp
index 40b2f91..706fbb5 100644
--- a/src/gprs_rlcmac_sched.cpp
+++ b/src/gprs_rlcmac_sched.cpp
@@ -388,6 +388,7 @@
 	uint8_t usf = 0x7;
 	struct msgb *msg = NULL;
 	uint32_t poll_fn, sba_fn;
+	enum pcu_gsmtap_category gsmtap_cat;
 
 	if (trx >= 8 || ts >= 8)
 		return -EINVAL;
@@ -426,19 +427,19 @@
 	/* Prio 1: select control message */
 	msg = sched_select_ctrl_msg(trx, ts, fn, block_nr, pdch, ul_ass_tbf,
 		dl_ass_tbf, ul_ack_tbf);
-	tap_n_acc(msg, bts, trx, ts, fn, PCU_GSMTAP_C_DL_CTRL);
+	gsmtap_cat = PCU_GSMTAP_C_DL_CTRL;
 
 	/* Prio 2: select data message for downlink */
 	if (!msg) {
 		msg = sched_select_downlink(bts, trx, ts, fn, block_nr, pdch);
-		tap_n_acc(msg, bts, trx, ts, fn, PCU_GSMTAP_C_DL_DATA_GPRS);
+		gsmtap_cat = PCU_GSMTAP_C_DL_DATA_GPRS;
 	}
 
 	/* Prio 3: send dummy contol message */
 	if (!msg) {
 		/* increase counter */
 		msg = sched_dummy();
-		tap_n_acc(msg, bts, trx, ts, fn, PCU_GSMTAP_C_DL_DUMMY);
+		gsmtap_cat = PCU_GSMTAP_C_DL_DUMMY;
 	}
 
 	if (!msg)
@@ -453,6 +454,9 @@
 	/* Used to measure the leak rate, count all blocks */
 	gprs_bssgp_update_frames_sent();
 
+	/* Send to GSMTAP */
+	tap_n_acc(msg, bts, trx, ts, fn, gsmtap_cat);
+
 	/* send PDTCH/PACCH to L1 */
 	pcu_l1if_tx_pdtch(msg, trx, ts, bts->trx[trx].arfcn, fn, block_nr);
 

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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Ib5ceb83a85b517ee9bf2c59cf27fe818373abe60
Gerrit-Change-Number: 21174
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201116/4257296e/attachment.htm>